[meta-xilinx] [PATCH 2/2] conf/machine: Prepend 'devicetree' directory for device-tree users

[Nathan Rossi]

Prepend the 'devicetree' subdirectory in IMAGE_BOOT_FILES for machines
that use the device-tree recipe.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 meta-xilinx-bsp/conf/machine/microzed-zynq7.conf      | 2 +-
 meta-xilinx-bsp/conf/machine/picozed-zynq7.conf       | 2 +-
 meta-xilinx-bsp/conf/machine/qemu-zynq7.conf          | 2 +-
 meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 +-
 meta-xilinx-contrib/conf/machine/minized-zynq7.conf   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 9cc97ec576..acac58f159 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -27,7 +27,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${MACHINE}.dtb \
+		devicetree/${MACHINE}.dtb \
 		uEnv.txt \
 		"
 
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index 8762832b6d..a9067b90e9 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -31,7 +31,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${MACHINE}.dtb \
+		devicetree/${MACHINE}.dtb \
 		uEnv.txt \
 		"
 
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 2c86edb38c..65bd46add2 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES = "ext2 vfat"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-IMAGE_BOOT_FILES += "${MACHINE}.dtb"
+IMAGE_BOOT_FILES += "devicetree/${MACHINE}.dtb"
 
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index 27b6d072e2..6cc89510e9 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -32,7 +32,7 @@ EXTRA_IMAGEDEPENDS += " \
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${MACHINE}.dtb \
+		devicetree/${MACHINE}.dtb \
 		bitstream \
 		uEnv.txt \
 		"
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
index 8ee1980b48..2f55c787a3 100644
--- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
@@ -27,6 +27,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${MACHINE}.dtb \
+		devicetree/${MACHINE}.dtb \
 		uEnv.txt \
 		"