raspberrypi4.conf: Only build rpi4 DT when this machine is selected

On the warrior branch we still need to support the 4.14.y kernel series
which does not support the Raspberry Pi 4. Therefore we can't assume
that the device tree for the Raspberry Pi 4 will always be present in
the kernel sources.

Signed-off-by: Paul Barker <paul@betafive.co.uk>

2 files changed, 2 insertions, 1 deletions

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index af1418d..b126617 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -47,7 +47,6 @@ RPI_KERNEL_DEVICETREE ?= " \
     bcm2709-rpi-2-b.dtb \
     bcm2710-rpi-3-b.dtb \
     bcm2710-rpi-3-b-plus.dtb \
-    bcm2711-rpi-4-b.dtb \
     bcm2708-rpi-cm.dtb \
     bcm2710-rpi-cm3.dtb \
     "
diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf
index 42c765f..b23fdc3 100644
--- a/conf/machine/raspberrypi4.conf
+++ b/conf/machine/raspberrypi4.conf
@@ -19,3 +19,5 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
 MACHINE_FEATURES_append = " vc4graphics"
 VC4DTBO ?= "vc4-fkms-v3d"
 ARMSTUB ?= "armstub7.bin"
+
+RPI_KERNEL_DEVICETREE += "bcm2711-rpi-4-b.dtb"