From 9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 11 May 2020 19:32:45 +0200 Subject: Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the templates to use the updated flags and configuration present in meta-raspberrypi. The previous template did not properly pull-in the u-boot fragments for the RPI4. v4: the MACHINE in the AGL template for the RPI4 is now 'raspberrypi4-64' as in upstream. CI will get support-patches through releng-scripts. Bug-AGL: SPEC-3368 Signed-off-by: Jan-Simon Möller Change-Id: Ia2acb54516464d433c64adfc7ba832ccfdf899c3 --- templates/machine/raspberrypi4/50_local.conf.inc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc index 4c14d14b9..e5556f278 100644 --- a/templates/machine/raspberrypi4/50_local.conf.inc +++ b/templates/machine/raspberrypi4/50_local.conf.inc @@ -1,8 +1,4 @@ -MACHINE = "raspberrypi4" -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc -require conf/include/agl_raspberrypi3.inc +MACHINE = "raspberrypi4-64" -#use the "Image" format for 64-bit AGL image for Raspberry Pi 4 -KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPE_UBOOT = "Image" -KERNEL_IMAGETYPE_DIRECT = "Image" +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +require conf/include/agl_raspberrypi4.inc -- cgit 1.2.3-korg