device-tree: Ensure the system.dtb is written to the /boot directory

The system.dtb should be a symlink to the system-top.dtb in the devicetree
subdirectory.  This matches the expected behavior for u-boot-zynq-scr and
possibly other users.

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

1 files changed, 8 insertions, 1 deletions

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 30cc362d..91a13fa1 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -34,12 +34,19 @@ DTB_FILE_NAME = "${@os.path.basename(d.getVar('CONFIG_DTFILE')).replace('.dts',
 
 DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"
 
-do_install:prepend() {
+FILES:${PN} += "/boot/system.dtb"
+devicetree_do_install:append() {
     if [ -n "${DTB_FILE_NAME}" ]; then
         # If it's already a dtb, we have to copy from the original location
         if [ -e "${DT_FILES_PATH}/${DTB_FILE_NAME}" ]; then
             install -Dm 0644 ${DT_FILES_PATH}/${DTB_FILE_NAME} ${D}/boot/devicetree/${DTB_FILE_NAME}
         fi
+        if [ -e "${D}/boot/devicetree/${DTB_FILE_NAME}" ]; then
+            # We need the output to be system.dtb for WIC setup to match XSCT flow
+            ln -sf devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
+        else
+            bberror "Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree"
+        fi
     fi
 }