aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2020-12-16 13:37:08 -0800
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2020-12-22 13:59:05 -0800
commita6a46f29c674a724d77eb9f8f3ccc7c520046dc0 (patch)
tree7af023d6a54a72b3728d140cea887698ff3bfe94
parentd803f4c34352b43226f2f0f32a7ac4bf667fe2d9 (diff)
downloadmeta-xilinx-a6a46f29c674a724d77eb9f8f3ccc7c520046dc0.tar.gz
meta-xilinx-a6a46f29c674a724d77eb9f8f3ccc7c520046dc0.tar.bz2
meta-xilinx-a6a46f29c674a724d77eb9f8f3ccc7c520046dc0.zip
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 <chandana.kalluri@xilinx.com>
-rw-r--r--meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass6
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf1
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@"