From a6a46f29c674a724d77eb9f8f3ccc7c520046dc0 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Wed, 16 Dec 2020 13:37:08 -0800 Subject: zcu102-zynqmp.conf: Fix qemuboot for zcu102-zynqmp Fix machine name being passed to zcu102-zynqmp qemu boot arg. Signed-off-by: Sai Hari Chandana Kalluri --- meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass | 6 +++--- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass index 62ecbdf9..1c3f2bb6 100644 --- a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass +++ b/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass @@ -5,10 +5,10 @@ OVERRIDES .= ":qemuboot-xilinx" # Default machine targets for Xilinx QEMU (FDT Generic) # Allow QB_MACHINE to be overridden by a BSP config QB_MACHINE ?= "${QB_MACHINE_XILINX}" - +QB_RNG="" 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" +QB_MACHINE_XILINX_arm = "-M arm-generic-fdt-7series" +QB_MACHINE_XILINX_microblaze = "-M microblaze-fdt-plnx" # defaults QB_DEFAULT_KERNEL ?= "none" diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index dee37978..2c890cfb 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \ " # This machine has a QEMU model, runqemu setup: -QB_MACHINE = "-machine xlnx-zcu102" 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@" -- cgit v1.2.3-54-g00ecf