summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2020-12-16 14:01:10 -0800
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2020-12-22 13:59:05 -0800
commitf8c4ca040ee48f0b63a134b6cd2fadbc7014dfdc (patch)
tree933c775601b667c6b48ee993da13d32052ceac0d
parent7f9e1589de1ea65e483254b1bc7d2964245a19f0 (diff)
downloadmeta-xilinx-f8c4ca040ee48f0b63a134b6cd2fadbc7014dfdc.tar.gz
Cleanup QB_MACHINE for xilinx machines
Pick correct QB_MACHINE name for each of the machine from qemuboot-xilinx.bbclass. Remove QB_MACHINE from machine.conf Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/versal-generic.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zynqmp-generic.conf1
5 files changed, 0 insertions, 5 deletions
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 4c174d2f..bbc06887 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
@@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \
37 boot.scr \ 37 boot.scr \
38" 38"
39# This machine has a QEMU model, runqemu setup: 39# This machine has a QEMU model, runqemu setup:
40QB_MACHINE = "-M arm-generic-fdt"
41QB_MEM = "-m 8G" 40QB_MEM = "-m 8G"
42QB_DEFAULT_KERNEL = "none" 41QB_DEFAULT_KERNEL = "none"
43QB_NETWORK_DEVICE = "" 42QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index c9813b70..1ab6a1c7 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -43,7 +43,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
43 43
44 44
45# This machine has a QEMU model, runqemu setup: 45# This machine has a QEMU model, runqemu setup:
46QB_MACHINE = "-M arm-generic-fdt"
47QB_MEM = "-m 8G" 46QB_MEM = "-m 8G"
48QB_DEFAULT_KERNEL = "none" 47QB_DEFAULT_KERNEL = "none"
49QB_NETWORK_DEVICE = "" 48QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index ba362793..dd6966a0 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -48,7 +48,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
48HDF_MACHINE = "vc-p-a2197-00-versal" 48HDF_MACHINE = "vc-p-a2197-00-versal"
49 49
50# This machine has a QEMU model, runqemu setup: 50# This machine has a QEMU model, runqemu setup:
51QB_MACHINE = "-M arm-generic-fdt"
52QB_MEM = "-m 8G" 51QB_MEM = "-m 8G"
53QB_DEFAULT_KERNEL = "none" 52QB_DEFAULT_KERNEL = "none"
54QB_NETWORK_DEVICE = "" 53QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index baa5e12f..e9044ba7 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -35,7 +35,6 @@ IMAGE_BOOT_FILES += " \
35" 35"
36 36
37# This machine has a QEMU model, runqemu setup: 37# This machine has a QEMU model, runqemu setup:
38QB_MACHINE = "-M arm-generic-fdt"
39QB_MEM = "-m 8G" 38QB_MEM = "-m 8G"
40QB_DEFAULT_KERNEL = "none" 39QB_DEFAULT_KERNEL = "none"
41QB_NETWORK_DEVICE = "" 40QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index ae5e8584..9c7dbe83 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -47,7 +47,6 @@ IMAGE_BOOT_FILES += " \
47 " 47 "
48 48
49# This machine has a QEMU model, runqemu setup: 49# This machine has a QEMU model, runqemu setup:
50QB_MACHINE = "-machine xlnx-zcu102"
51QB_MEM = "-m 4096" 50QB_MEM = "-m 4096"
52QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" 51QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
53QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" 52QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"