From 85c9b317f7f7ca3c11a71c8083d83515aa602940 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 1 Feb 2018 02:20:19 +1000 Subject: machine-xilinx-qemu.inc: Remove KERNEL_DEVICETREE parsing Remove the parsing of KERNEL_DEVICETREE as by default those values will be populated into the IMAGE_BOOT_FILES variable. Also add a note describing why wildcard patterns work in the QB_DTB field. Signed-off-by: Nathan Rossi Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc index dd275f3b..5eb4b5c4 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc @@ -8,15 +8,11 @@ def qemu_default_dtb(d): if d.getVar("IMAGE_BOOT_FILES", True): dtbs = d.getVar("IMAGE_BOOT_FILES", True).split(" ") # IMAGE_BOOT_FILES has extra renaming info in the format ';' + # Note: Wildcard sources work here only because runqemu expands them at run time dtbs = [f.split(";")[0] for f in dtbs] dtbs = [f for f in dtbs if f.endswith(".dtb")] if len(dtbs) != 0: return dtbs[0] - if d.getVar("KERNEL_DEVICETREE", True): - dtbs = d.getVar("KERNEL_DEVICETREE", True).split(" ") - dtbs = [os.path.basename(d) for d in dtbs] - if len(dtbs) != 0: - return d.getVar("KERNEL_IMAGETYPE", True) + "-" + dtbs[0] return "" def qemu_default_serial(d): -- cgit v1.2.3-54-g00ecf