aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-08-09 20:36:40 +1000
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commit0865c6370199c65332763c2d407da613f7cb8530 (patch)
treee3b05f13e01961290698587bd2c379fdc7cdc02b
parentb6f2540b0ab22dba8b90e68f4151e865483d51d9 (diff)
downloadmeta-xilinx-0865c6370199c65332763c2d407da613f7cb8530.tar.gz
meta-xilinx-0865c6370199c65332763c2d407da613f7cb8530.tar.bz2
meta-xilinx-0865c6370199c65332763c2d407da613f7cb8530.zip
conf/machine: Prepend 'devicetree' directory for device-tree users
Prepend the 'devicetree' subdirectory in IMAGE_BOOT_FILES for machines that use the device-tree recipe. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf2
-rw-r--r--meta-xilinx-contrib/conf/machine/minized-zynq7.conf2
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 9cc97ec..acac58f 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 8762832..a9067b9 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 2c86edb..65bd46a 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 27b6d07..6cc8951 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 8ee1980..2f55c78 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 \
"