From f20fc414f30803c126bea4222d9fb2bb73c2b07f Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Sun, 4 Nov 2018 20:58:15 -0800 Subject: 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 Signed-off-by: Manjukumar Matha --- meta-xilinx-contrib/conf/machine/minized-zynq7.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-xilinx-contrib') 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" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" IMAGE_BOOT_FILES += " \ - devicetree/${MACHINE}.dtb \ uEnv.txt \ " -- cgit v1.2.3-54-g00ecf