device-tree: rework prestep integration

All configurations are expected to pass in a pre-processed device tree.  Use
this version unconditionally.

In order to allow a Linux build, without 'system-top.dtb', we need to prepend
the components in do_deploy as they expect some level of processing to have
happened.

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

1 files changed, 4 insertions, 2 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
index 6aadcb48..a38c1386 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,12 +1,14 @@
 CONFIG_DTFILE ?= ""
 
-do_install_append_xilinx-standalone() {
+do_install_prepend() {
     for DTB_FILE in ${CONFIG_DTFILE}; do
         install -Dm 0644 ${DTB_FILE} ${D}/boot/devicetree/$(basename ${DTB_FILE})
     done
 }
 
-do_deploy_append_xilinx-standalone() {
+# This needs to run BEFORE the device tree version, otherwise it can error with
+# Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree
+devicetree_do_deploy_prepend() {
     for DTB_FILE in ${CONFIG_DTFILE}; do
         install -Dm 0644 ${DTB_FILE} ${DEPLOYDIR}/devicetree/$(basename ${DTB_FILE})
     done