summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-contrib
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-11-04 20:58:15 -0800
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commitf20fc414f30803c126bea4222d9fb2bb73c2b07f (patch)
treeefc539d39cf1450aa28ae261010dc5cb57f40744 /meta-xilinx-contrib
parentc2823e683db1207e6bff7055c77d215301b4c163 (diff)
downloadmeta-xilinx-f20fc414f30803c126bea4222d9fb2bb73c2b07f.tar.gz
machine-xilinx-default.inc: Add dtb files for IMAGE_BOOT_FILES
Add all available dtb sources to the IMAGE_BOOT_FILES variable. For device-tree recipe generated dtbs the files available are only known after they files are deployed, so a wildcard pattern is used for these files. Note that this pattern appears before the kernel device trees due to the preference to use custom non-kernel device trees where available. This ordering is needed so that recipes like u-boot-zynq-uenv can pick the first device tree to select as the default. The kernel device trees are specifically selected based on the value of KERNEL_DEVICETREE, this avoid the duplication of kernel image type prefixed files along side having the actual files that the kernel builds. Additionally remove all instances of "${MACHINE}.dtb" as they no longer need to be specified and are incorrect due to the nesting of the files in the `devicetree` directory. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Diffstat (limited to 'meta-xilinx-contrib')
-rw-r--r--meta-xilinx-contrib/conf/machine/minized-zynq7.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
index 5bacdd50..ec706b6e 100644
--- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
@@ -24,6 +24,5 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
24MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" 24MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
25 25
26IMAGE_BOOT_FILES += " \ 26IMAGE_BOOT_FILES += " \
27 devicetree/${MACHINE}.dtb \
28 uEnv.txt \ 27 uEnv.txt \
29 " 28 "