From 99ebafd75a43749df0f4bea8ba46f976bcc1a00b Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@gherzan.com>
Date: Thu, 26 Jul 2018 19:27:41 +0100
Subject: [PATCH] rpi-base.inc: Split overlays and dtbs from KERNEL_DEVICETREE

This is helpful for example in the cases where the kernel doesn't
provide all the dtbs in arm64 as in arm.

Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
---
 conf/machine/include/rpi-base.inc | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index b01c561..2af1588 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -14,16 +14,7 @@ XSERVER = " \
     ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \
     "
 
-KERNEL_DEVICETREE ?= " \
-    bcm2708-rpi-0-w.dtb \
-    bcm2708-rpi-b.dtb \
-    bcm2708-rpi-b-plus.dtb \
-    bcm2709-rpi-2-b.dtb \
-    bcm2710-rpi-3-b.dtb \
-    bcm2710-rpi-3-b-plus.dtb \
-    bcm2708-rpi-cm.dtb \
-    bcm2710-rpi-cm3.dtb \
-    \
+RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/dwc2.dtbo \
     overlays/hifiberry-amp.dtbo \
     overlays/hifiberry-dac.dtbo \
@@ -46,6 +37,22 @@ KERNEL_DEVICETREE ?= " \
     overlays/at86rf233.dtbo \
     "
 
+RPI_KERNEL_DEVICETREE ?= " \
+    bcm2708-rpi-0-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-plus.dtb \
+    bcm2709-rpi-2-b.dtb \
+    bcm2710-rpi-3-b.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
+    "
+
+KERNEL_DEVICETREE ?= " \
+    ${RPI_KERNEL_DEVICETREE} \
+    ${RPI_KERNEL_DEVICETREE_OVERLAYS} \
+    "
+
 # By default:
 #
 # * When u-boot is disabled use the "Image" format which can be directly loaded