From 0deecd58dfd0fb5f6463f1b779076cd1e518854c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 12 Mar 2020 10:52:29 -0700 Subject: xilinx-qemu: Move -multiarch extension to the machine-xilinx-qemu All xilinx BSPs that support qemu should use the machine-xilinx-qemu.inc file. So move all references to the -multiarch extension into that location. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc | 1 + meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | 3 --- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 3 --- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 3 --- 4 files changed, 1 insertion(+), 9 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 3d3eae5c..74eeff4d 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc @@ -44,6 +44,7 @@ def qemu_zynqmp_unhalt(d, multiarch): return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4" # For qemuboot, default setup across all machines in meta-xilinx +QB_SYSTEM_NAME_aarch64 ?= "${@qemu_target_binary(d)}-multiarch" QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" QB_DEFAULT_FSTYPE ?= "cpio" QB_DTB ?= "${@qemu_default_dtb(d)}" diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf index 4a5c5b02..94d94c8b 100644 --- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf @@ -47,10 +47,7 @@ QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd" QB_OPT_APPEND_append_qemuboot-xilinx = " -boot mode=5" QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" -# Use the multiarch script instead of launching QEMU directly # Use booti 80000 6000000 4000000 to launch -QB_SYSTEM_NAME_append = "-multiarch" - QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" QB_OPT_APPEND_append_qemuboot-xilinx = " \ diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index cb1921dd..f16ca9f7 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -53,10 +53,7 @@ QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd" QB_OPT_APPEND_append_qemuboot-xilinx = " -boot mode=5" QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" -# Use the multiarch script instead of launching QEMU directly # Use booti 80000 6000000 4000000 to launch -QB_SYSTEM_NAME_append = "-multiarch" - QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" QB_OPT_APPEND_append_qemuboot-xilinx = " \ diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index ecf85589..855a5b85 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -43,9 +43,6 @@ QB_MEM = "-m 4096" QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" -# Use the multiarch script instead of launching QEMU directly -QB_SYSTEM_NAME_append = "-multiarch" - # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) QB_OPT_APPEND_append_qemuboot-xilinx = " \ -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \ -- cgit v1.2.3-54-g00ecf