qemu-devicetrees: Deploying of MULTI_ARCH device trees

Deploy the MULTI_ARCH specific device trees for use with QEMU.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Tested-by: Alistair Francis <alistair.francis@xilinx.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb b/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
index dc38f75d..df9c2c8c 100644
--- a/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
+++ b/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
@@ -18,15 +18,14 @@ do_install() {
 }
 
 do_deploy() {
+        # single-arch dtbs
         for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do
-                if [ ! -f ${DTS_FILE} ]; then
-                        bbwarn "${DTS_FILE} is not available!"
-                        continue
-                fi
-                DTS_NAME=`basename ${DTS_FILE} .dtb`
-                install -d ${DEPLOYDIR}
-                install -d ${DEPLOYDIR}/qemu-hw-devicetrees
-                install -m 0644 ${S}/LATEST/SINGLE_ARCH/${DTS_NAME}.dtb ${DEPLOYDIR}/qemu-hw-devicetrees/${DTS_NAME}.dtb
+                install -Dm 0644 $DTS_FILE ${DEPLOYDIR}/qemu-hw-devicetrees/$(basename $DTS_FILE .dtb).dtb
+        done
+
+        # multi-arch dtbs
+        for DTS_FILE in ${S}/LATEST/MULTI_ARCH/*.dtb; do
+                install -Dm 0644 $DTS_FILE ${DEPLOYDIR}/qemu-hw-devicetrees/multiarch/$(basename $DTS_FILE .dtb).dtb
         done
 }