diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-12-16 14:01:10 -0800 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-12-22 13:59:05 -0800 |
| commit | f8c4ca040ee48f0b63a134b6cd2fadbc7014dfdc (patch) | |
| tree | 933c775601b667c6b48ee993da13d32052ceac0d | |
| parent | 7f9e1589de1ea65e483254b1bc7d2964245a19f0 (diff) | |
| download | meta-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>
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: |
| 40 | QB_MACHINE = "-M arm-generic-fdt" | ||
| 41 | QB_MEM = "-m 8G" | 40 | QB_MEM = "-m 8G" |
| 42 | QB_DEFAULT_KERNEL = "none" | 41 | QB_DEFAULT_KERNEL = "none" |
| 43 | QB_NETWORK_DEVICE = "" | 42 | QB_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: |
| 46 | QB_MACHINE = "-M arm-generic-fdt" | ||
| 47 | QB_MEM = "-m 8G" | 46 | QB_MEM = "-m 8G" |
| 48 | QB_DEFAULT_KERNEL = "none" | 47 | QB_DEFAULT_KERNEL = "none" |
| 49 | QB_NETWORK_DEVICE = "" | 48 | QB_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" | |||
| 48 | HDF_MACHINE = "vc-p-a2197-00-versal" | 48 | HDF_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: |
| 51 | QB_MACHINE = "-M arm-generic-fdt" | ||
| 52 | QB_MEM = "-m 8G" | 51 | QB_MEM = "-m 8G" |
| 53 | QB_DEFAULT_KERNEL = "none" | 52 | QB_DEFAULT_KERNEL = "none" |
| 54 | QB_NETWORK_DEVICE = "" | 53 | QB_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: |
| 38 | QB_MACHINE = "-M arm-generic-fdt" | ||
| 39 | QB_MEM = "-m 8G" | 38 | QB_MEM = "-m 8G" |
| 40 | QB_DEFAULT_KERNEL = "none" | 39 | QB_DEFAULT_KERNEL = "none" |
| 41 | QB_NETWORK_DEVICE = "" | 40 | QB_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: |
| 50 | QB_MACHINE = "-machine xlnx-zcu102" | ||
| 51 | QB_MEM = "-m 4096" | 50 | QB_MEM = "-m 4096" |
| 52 | QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" | 51 | QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null" |
| 53 | QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" | 52 | QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" |
