From 75fb411c1a71c107d25adc620c79c3ac0bafbbae Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Thu, 20 Feb 2020 21:53:13 +0200
Subject: [PATCH] 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 <leon.anavi@konsulko.com>
---
meta-agl-bsp/conf/machine/include/rpi4-base.inc | 4 ++++
1 file changed, 4 insertions(+)
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
--
2.16.6