[meta-xilinx] [PATCH 5/7] machine-xilinx-qemu.inc: Remove KERNEL_DEVICETREE parsing

Nathan Rossi nathan at nathanrossi.com
Wed Jan 31 08:20:19 PST 2018


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 <nathan at nathanrossi.com>
---
 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 dd275f3b48..5eb4b5c470 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 '<source>;<target>'
+        # 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):
-- 
2.15.1



More information about the meta-xilinx mailing list