summaryrefslogtreecommitdiffstats
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
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"
5# Default machine targets for Xilinx QEMU (FDT Generic) 5# Default machine targets for Xilinx QEMU (FDT Generic)
6# Allow QB_MACHINE to be overridden by a BSP config 6# Allow QB_MACHINE to be overridden by a BSP config
7QB_MACHINE ?= "${QB_MACHINE_XILINX}" 7QB_MACHINE ?= "${QB_MACHINE_XILINX}"
8 8QB_RNG=""
9QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt" 9QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt"
10QB_MACHINE_XILINX_arm = "-machine arm-generic-fdt-7series" 10QB_MACHINE_XILINX_arm = "-M arm-generic-fdt-7series"
11QB_MACHINE_XILINX_microblaze = "-machine microblaze-fdt-plnx" 11QB_MACHINE_XILINX_microblaze = "-M microblaze-fdt-plnx"
12 12
13# defaults 13# defaults
14QB_DEFAULT_KERNEL ?= "none" 14QB_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 += " \
37 " 37 "
38 38
39# This machine has a QEMU model, runqemu setup: 39# This machine has a QEMU model, runqemu setup:
40QB_MACHINE = "-machine xlnx-zcu102"
41QB_MEM = "-m 4096" 40QB_MEM = "-m 4096"
42QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" 41QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
43QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" 42QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"