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 --- .../conf/machine/include/machine-xilinx-default.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc') diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc index e4c99b8f..153a47fb 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -57,12 +57,18 @@ def get_default_image_boot_files(d): if d.getVar("UBOOT_BINARY"): files.append(d.getVar("UBOOT_BINARY")) + # device trees (device-tree only), these are first as they are likely desired over the kernel ones + if "device-tree" in (d.getVar("MACHINE_ESSENTIAL_EXTRA_RDEPENDS") or ""): + files.append("devicetree/*.dtb") + + # device trees (kernel only) if d.getVar("KERNEL_DEVICETREE"): dtbs = d.getVar("KERNEL_DEVICETREE").split(" ") dtbs = [os.path.basename(d) for d in dtbs] - if len(dtbs) != 0: - files += [d.getVar("KERNEL_IMAGETYPE") + "-" + dtb for dtb in dtbs] + for dtb in dtbs: + files.append(dtb) + return " ".join(files) XSERVER_EXT ?= "" -- cgit v1.2.3-54-g00ecf