diff options
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/classes')
4 files changed, 27 insertions, 11 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass index 59dfabfcc..45417ea7b 100644 --- a/meta-xilinx/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass +++ b/meta-xilinx/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass @@ -1,10 +1,10 @@ # Define the 'qemu-sd' conversion type # -# This conversion type pads any image to the 256K boundary to ensure that the +# This conversion type pads any image to the 512K boundary to ensure that the # image file can be used directly with QEMU's SD emulation which requires the # block device to match that of valid SD card sizes (which are multiples of -# 256K). +# 512K). CONVERSIONTYPES_append = " qemu-sd" -CONVERSION_CMD_qemu-sd = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd; truncate -s %256K ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd" +CONVERSION_CMD_qemu-sd = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd; truncate -s %512K ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd" CONVERSION_DEPENDS_qemu-sd = "coreutils-native" 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 024626cbf..62ecbdf91 100644 --- a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass +++ b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass @@ -2,13 +2,13 @@ # enable the overrides for the context of the conf only OVERRIDES .= ":qemuboot-xilinx" -# setup the target binary -QB_SYSTEM_NAME_prepend = "qemu-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" diff --git a/meta-xilinx/meta-xilinx-bsp/classes/xlnx-standalone.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/xlnx-standalone.bbclass new file mode 100644 index 000000000..9232b1ef4 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/classes/xlnx-standalone.bbclass @@ -0,0 +1,16 @@ +# Only enabled when ilp32 is enabled. +def xlnx_ilp32_dict(machdata, d): + machdata["elf"] = { + "aarch64" : (183, 0, 0, True, 32), + "aarch64_be" :(183, 0, 0, False, 32), + } + return machdata + +# Only enabled when microblaze64 is enabled. +def xlnx_mb64_dict(machdata, d): + machdata["elf"] = { + "microblaze": (189, 0, 0, False, 64), + "microblazeeb":(189, 0, 0, False, 64), + "microblazeel":(189, 0, 0, True, 64), + } + return machdata |