meta-xilinx-standalone-experimental: Move from device-tree-lops to device-tree

The device trees are now generated by the user as part of the configuration
steps.  As such, we need to simply copy/process these device trees as part
of the system build so adjust the various usages to the new variable
CONFIG_DTFILE, which is a full path reference to the device tree for a
particular configuration.

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

2 files changed, 14 insertions, 1 deletions

diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
new file mode 100644
index 00000000..6aadcb48
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
@@ -0,0 +1,13 @@
+CONFIG_DTFILE ?= ""
+
+do_install_append_xilinx-standalone() {
+    for DTB_FILE in ${CONFIG_DTFILE}; do
+        install -Dm 0644 ${DTB_FILE} ${D}/boot/devicetree/$(basename ${DTB_FILE})
+    done
+}
+
+do_deploy_append_xilinx-standalone() {
+    for DTB_FILE in ${CONFIG_DTFILE}; do
+        install -Dm 0644 ${DTB_FILE} ${DEPLOYDIR}/devicetree/$(basename ${DTB_FILE})
+    done
+}
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
index a50ea86c..d241df32 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
@@ -15,7 +15,7 @@ ESW_COMPONENT_SRC_zynqmp = "/lib/sw_apps/zynqmp_fsbl/src"
 
 DEPENDS += "xilstandalone xiltimer xilffs xilsecure xilpm"
 
-do_copy_psu_init[depends] += "device-tree-lops:do_deploy"
+do_copy_psu_init[depends] += "device-tree:do_deploy"
 python do_copy_psu_init() {
     import glob, subprocess, os