From: Leon Anavi Date: Thu, 20 Feb 2020 19:53:13 +0000 (+0200) Subject: rpi4-base.inc: KERNEL_DEVICETREE for rpi4 and sota X-Git-Tag: 9.0.1~7 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d6755e2c797c51a1ef2433d0c191f92c6c341773;p=AGL%2Fmeta-agl.git rpi4-base.inc: KERNEL_DEVICETREE for rpi4 and sota Use different dtb and dtbo files for Raspberry Pi 4 when agl-sota is enabled. This modification is required for successfully building a kernel because in AGL machine raspberrypi4 is for 64-bit image and in class sota_raspberrypi layer meta-updater the same machine name is targeting 32-bit image. Bug-AGL: SPEC-3130 Change-Id: I5fd4bccfe605fea4e14499183279032a8bf0562e Signed-off-by: Leon Anavi --- diff --git a/meta-agl-bsp/conf/machine/include/rpi4-base.inc b/meta-agl-bsp/conf/machine/include/rpi4-base.inc index 36a8daf1a..a19d0f882 100644 --- a/meta-agl-bsp/conf/machine/include/rpi4-base.inc +++ b/meta-agl-bsp/conf/machine/include/rpi4-base.inc @@ -57,6 +57,10 @@ KERNEL_DEVICETREE ?= " \ ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ " +# Different dtb and dtbo files are needed for Raspberry Pi 4 +# (64-bit) if feature agl-sota is enabled. +KERNEL_DEVICETREE_raspberrypi4_sota = " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" + # By default: # # * When u-boot is disabled use the "Image" format which can be directly loaded