diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-10-16 18:11:54 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-10-16 18:11:54 +0300 |
| commit | a9ff2b33c004367b3dbded5d54d7a272ed76f68f (patch) | |
| tree | a3c47ab3a1b1af411639ea6221a680f5f3cb490d /meta-xilinx/meta-xilinx-bsp/classes | |
| parent | 9129b24a007278f4002886e4734bc217603f14ce (diff) | |
| download | openbmc-a9ff2b33c004367b3dbded5d54d7a272ed76f68f.tar.xz | |
reset meta-xilinx subtree on master HEAD(874b9cee5e)
Change-Id: Ic0716e95ff53e7d63c54dc5fce6ee42fc99ed424
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/classes')
| -rw-r--r-- | meta-xilinx/meta-xilinx-bsp/classes/image-wic-utils.bbclass | 4 | ||||
| -rw-r--r-- | meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/classes/image-wic-utils.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/image-wic-utils.bbclass index 6f66d553e..562f3263e 100644 --- a/meta-xilinx/meta-xilinx-bsp/classes/image-wic-utils.bbclass +++ b/meta-xilinx/meta-xilinx-bsp/classes/image-wic-utils.bbclass @@ -9,7 +9,7 @@ def boot_files_split_expand(d): # IMAGE_BOOT_FILES has extra renaming info in the format '<source>;<target>' for f in (d.getVar("IMAGE_BOOT_FILES") or "").split(" "): parts = f.split(";", 1) - sources = [parts[0]] + sources = [parts[0].strip()] if "*" in parts[0]: # has glob part import glob @@ -21,7 +21,7 @@ def boot_files_split_expand(d): # for all sources, yield an entry for s in sources: if len(parts) == 2: - yield s, parts[1] + yield s, parts[1].strip() yield s, s def boot_files_bitstream(d): diff --git a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass index 124454ab7..62ecbdf91 100644 --- a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass +++ b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass @@ -3,9 +3,12 @@ OVERRIDES .= ":qemuboot-xilinx" # Default machine targets for Xilinx QEMU (FDT Generic) -QB_MACHINE_aarch64 = "-machine arm-generic-fdt" -QB_MACHINE_arm = "-machine arm-generic-fdt-7series" -QB_MACHINE_microblaze = "-machine microblaze-generic-fdt-plnx" +# Allow QB_MACHINE to be overridden by a BSP config +QB_MACHINE ?= "${QB_MACHINE_XILINX}" + +QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt" +QB_MACHINE_XILINX_arm = "-machine arm-generic-fdt-7series" +QB_MACHINE_XILINX_microblaze = "-machine microblaze-fdt-plnx" # defaults QB_DEFAULT_KERNEL ?= "none" |