summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-05-11 19:32:45 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 23:50:18 +0000
commit9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 (patch)
treea47c6b4c974cc2f3c59ed176af66bf0752b274f4 /templates
parent4ee8c933aa9726f0493ead14b4e1c97a0844ec28 (diff)
Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration
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 <jsmoeller@linuxfoundation.org> Change-Id: Ia2acb54516464d433c64adfc7ba832ccfdf899c3
Diffstat (limited to 'templates')
-rw-r--r--templates/machine/raspberrypi4/50_local.conf.inc10
1 files changed, 3 insertions, 7 deletions
diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc
index 4c14d14..e5556f2 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