diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2018-02-01 02:20:19 +1000 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-01-01 20:03:46 -0800 |
commit | 85c9b317f7f7ca3c11a71c8083d83515aa602940 (patch) | |
tree | 83a60f24eb8c06337667e4036a52a1ab93972c54 /meta-xilinx-bsp/conf/machine | |
parent | f20fc414f30803c126bea4222d9fb2bb73c2b07f (diff) | |
download | meta-xilinx-85c9b317f7f7ca3c11a71c8083d83515aa602940.tar.gz |
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>
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc | 6 |
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 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): | |||
8 | if d.getVar("IMAGE_BOOT_FILES", True): | 8 | if d.getVar("IMAGE_BOOT_FILES", True): |
9 | dtbs = d.getVar("IMAGE_BOOT_FILES", True).split(" ") | 9 | dtbs = d.getVar("IMAGE_BOOT_FILES", True).split(" ") |
10 | # IMAGE_BOOT_FILES has extra renaming info in the format '<source>;<target>' | 10 | # IMAGE_BOOT_FILES has extra renaming info in the format '<source>;<target>' |
11 | # Note: Wildcard sources work here only because runqemu expands them at run time | ||
11 | dtbs = [f.split(";")[0] for f in dtbs] | 12 | dtbs = [f.split(";")[0] for f in dtbs] |
12 | dtbs = [f for f in dtbs if f.endswith(".dtb")] | 13 | dtbs = [f for f in dtbs if f.endswith(".dtb")] |
13 | if len(dtbs) != 0: | 14 | if len(dtbs) != 0: |
14 | return dtbs[0] | 15 | return dtbs[0] |
15 | if d.getVar("KERNEL_DEVICETREE", True): | ||
16 | dtbs = d.getVar("KERNEL_DEVICETREE", True).split(" ") | ||
17 | dtbs = [os.path.basename(d) for d in dtbs] | ||
18 | if len(dtbs) != 0: | ||
19 | return d.getVar("KERNEL_IMAGETYPE", True) + "-" + dtbs[0] | ||
20 | return "" | 16 | return "" |
21 | 17 | ||
22 | def qemu_default_serial(d): | 18 | def qemu_default_serial(d): |