aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-02-01 02:20:19 +1000
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commit85c9b317f7f7ca3c11a71c8083d83515aa602940 (patch)
tree83a60f24eb8c06337667e4036a52a1ab93972c54
parentf20fc414f30803c126bea4222d9fb2bb73c2b07f (diff)
downloadmeta-xilinx-85c9b317f7f7ca3c11a71c8083d83515aa602940.tar.gz
meta-xilinx-85c9b317f7f7ca3c11a71c8083d83515aa602940.tar.bz2
meta-xilinx-85c9b317f7f7ca3c11a71c8083d83515aa602940.zip
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 <nathan@nathanrossi.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc6
1 files changed, 1 insertions, 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 dd275f3..5eb4b5c 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):