device-tree: Break into base bb and board specific bbappend

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

10 files changed, 23 insertions, 21 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
new file mode 100644
index 00000000..df31778c
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
@@ -0,0 +1,23 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+# device tree sources for the various machines
+COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
+SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
+
+COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
+SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
+
+COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
+SRC_URI:append:zybo-linux-bd-zynq7 = " \
+                file://zybo-linux-bd-zynq7.dts \
+                file://pcw.dtsi \
+                file://pl.dtsi \
+                "
+
+COMPATIBLE_MACHINE:kc705-microblazeel = ".*"
+SRC_URI:append:kc705-microblazeel = " \
+                file://kc705-microblazeel.dts \
+                file://pl.dtsi \
+                file://system-conf.dtsi \
+                "
+
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
index 45e488c1..45e488c1 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
index 43bc2ab7..43bc2ab7 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
index 09b26c6a..09b26c6a 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/picozed-zynq7.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
index 6f9b653a..6f9b653a 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/picozed-zynq7.dts
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/qemu-zynq7.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts
index cd0694d6..cd0694d6 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/qemu-zynq7.dts
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
index 0f678d39..0f678d39 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
index 32bc7688..32bc7688 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
index 19654392..19654392 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 3e71eeaf..27f008f8 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -31,27 +31,6 @@ PROVIDES = "virtual/dtb"
 # common zynq include
 SRC_URI:append:zynq = " file://zynq-7000-qspi-dummy.dtsi"
 
-# device tree sources for the various machines
-COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
-SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
-
-COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
-SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
-
-COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
-SRC_URI:append:zybo-linux-bd-zynq7 = " \
-                file://zybo-linux-bd-zynq7.dts \
-                file://pcw.dtsi \
-                file://pl.dtsi \
-                "
-
-COMPATIBLE_MACHINE:kc705-microblazeel = ".*"
-SRC_URI:append:kc705-microblazeel = " \
-                file://kc705-microblazeel.dts \
-                file://pl.dtsi \
-                file://system-conf.dtsi \
-                "
-
 DTB_FILE_NAME = "${@os.path.basename(d.getVar('SYSTEM_DTFILE')).replace('.dts', '.dtb') if d.getVar('SYSTEM_DTFILE') else ''}"
 DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"