device-tree.bbappend: Move use of MACHINE_DEVICETREE to SRC_URI

Remove the use of MACHINE_DEVICETREE for providing sources to
device-tree, instead provide the device tree sources as SRC_URI entires.
Whilst this was already being done automatically by the
MACHINE_DEVICETREE logic it also created a non-standard way of providing
the device tree sources to the recipe.

The setup of SRC_URI is done via the use of a device-tree.bbappend
instead of directly in the device-tree.bb recipe itself. This is for two
reason, separation of the source from the build logic as well as to
provide an example for how a user can extend the device-tree recipe to
provide custom device tree sources in their layer.

This change also moves the paths to the sources around, this is to align
the names of the directories to match the OVERRIDES so that when
expanding the file paths it will search the subdirs based on the
OVERRIDES or machine names.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

16 files changed, 21 insertions, 13 deletions

diff --git a/conf/machine/kc705-microblazeel.conf b/conf/machine/kc705-microblazeel.conf
index cea1d173..efd83b78 100644
--- a/conf/machine/kc705-microblazeel.conf
+++ b/conf/machine/kc705-microblazeel.conf
@@ -15,10 +15,6 @@ USE_VT = ""
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-MACHINE_DEVICETREE := " \
-                kc705/kc705-microblazeel.dts \
-                kc705/pl.dtsi \
-                kc705/system-conf.dtsi"
 
 EXTRA_IMAGEDEPENDS += "virtual/bitstream"
 
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index 9a00e61d..8e24d5f5 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -15,7 +15,6 @@ SPL_BINARY = "spl/boot.bin"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-MACHINE_DEVICETREE = "microzed/microzed-zynq7.dts"
 
 IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
 
diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
index 12b0fde2..e1d723c4 100644
--- a/conf/machine/picozed-zynq7.conf
+++ b/conf/machine/picozed-zynq7.conf
@@ -19,7 +19,6 @@ SPL_BINARY = "spl/boot.bin"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-MACHINE_DEVICETREE = "picozed/picozed-zynq7.dts"
 
 IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
 
diff --git a/conf/machine/qemu-zynq7.conf b/conf/machine/qemu-zynq7.conf
index e3cd575a..6d55f09d 100644
--- a/conf/machine/qemu-zynq7.conf
+++ b/conf/machine/qemu-zynq7.conf
@@ -11,7 +11,6 @@ MACHINE_FEATURES = "ext2 vfat"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-MACHINE_DEVICETREE = "qemu/qemu-zynq7.dts"
 
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf
index f5524c12..a5c572f6 100644
--- a/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/conf/machine/zybo-linux-bd-zynq7.conf
@@ -17,12 +17,6 @@ SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
-MACHINE_DEVICETREE = " \
-                zybo-linux-bd/pcw.dtsi \
-                zybo-linux-bd/pl.dtsi \
-                zybo-linux-bd/zybo-linux-bd-zynq7.dts \
-                "
-
 UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY = "spl/boot.bin"
 FORCE_PS7INIT = "zybo"
diff --git a/recipes-bsp/device-tree/device-tree.bbappend b/recipes-bsp/device-tree/device-tree.bbappend
new file mode 100644
index 00000000..4f46e358
--- /dev/null
+++ b/recipes-bsp/device-tree/device-tree.bbappend
@@ -0,0 +1,21 @@
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+# common zynq include
+SRC_URI_append_zynq = " file://zynq-7000-qspi-dummy.dtsi"
+
+# device tree sources for the various machines
+SRC_URI_append_picozed-zynq7 = " file://picozed-zynq7.dts"
+SRC_URI_append_microzed-zynq7 = " file://microzed-zynq7.dts"
+SRC_URI_append_qemu-zynq7 = " file://qemu-zynq7.dts"
+SRC_URI_append_zybo-linux-bd-zynq7 = " \
+                file://zybo-linux-bd-zynq7.dts \
+                file://pcw.dtsi \
+                file://pl.dtsi \
+                "
+SRC_URI_append_kc705-microblazeel = " \
+                file://kc705-microblazeel.dts \
+                file://pl.dtsi \
+                file://system-conf.dtsi \
+                "
+
diff --git a/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts b/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
index af60db87..af60db87 100644
--- a/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts
+++ b/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
diff --git a/recipes-bsp/device-tree/files/kc705/pl.dtsi b/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
index 8f064671..8f064671 100644
--- a/recipes-bsp/device-tree/files/kc705/pl.dtsi
+++ b/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
diff --git a/recipes-bsp/device-tree/files/kc705/system-conf.dtsi b/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
index 2a824aec..2a824aec 100644
--- a/recipes-bsp/device-tree/files/kc705/system-conf.dtsi
+++ b/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
diff --git a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts b/recipes-bsp/device-tree/files/microzed-zynq7.dts
index b9376a49..b9376a49 100644
--- a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts
+++ b/recipes-bsp/device-tree/files/microzed-zynq7.dts
diff --git a/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts b/recipes-bsp/device-tree/files/picozed-zynq7.dts
index 4ec64f5e..4ec64f5e 100644
--- a/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts
+++ b/recipes-bsp/device-tree/files/picozed-zynq7.dts
diff --git a/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts b/recipes-bsp/device-tree/files/qemu-zynq7.dts
index cd0694d6..cd0694d6 100644
--- a/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts
+++ b/recipes-bsp/device-tree/files/qemu-zynq7.dts
diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/pcw.dtsi b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
index 0f678d39..0f678d39 100644
--- a/recipes-bsp/device-tree/files/zybo-linux-bd/pcw.dtsi
+++ b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
index 32bc7688..32bc7688 100644
--- a/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi
+++ b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
index 79deba49..79deba49 100644
--- a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts
+++ b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
diff --git a/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi b/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi
index d059a2da..d059a2da 100644
--- a/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi
+++ b/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi