diff options
author | Trevor Woerner <twoerner@gmail.com> | 2023-02-21 15:44:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-23 12:11:29 +0000 |
commit | 9e0145df7a9d18b97edc617d1321dc361648bb04 (patch) | |
tree | 65e50e5e4829bdf4c99435bd1ff3e9865f26923e /meta/conf/machine | |
parent | 84f3d39dd24c8a814cf974aa390ffa558421eebd (diff) | |
download | poky-9e0145df7a9d18b97edc617d1321dc361648bb04.tar.gz |
QB_SMP: allow user modification
Allow a user to override the QM_SMP value giving them the opportunity to
select for themselves the number of CPUs to use in qemu.
(From OE-Core rev: 70a91e6d0357149c00b97f7e66e16cbc52997a92)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/riscv/qemuriscv.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/x86/qemuboot-x86.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc64.conf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 1d32b4a582..c977a266ca 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc | |||
@@ -26,7 +26,7 @@ UBOOT_ENTRYPOINT:riscv32 = "0x80400000" | |||
26 | UBOOT_ENTRYPOINT:riscv64 = "0x80200000" | 26 | UBOOT_ENTRYPOINT:riscv64 = "0x80200000" |
27 | 27 | ||
28 | # qemuboot options | 28 | # qemuboot options |
29 | QB_SMP = "-smp 4" | 29 | QB_SMP ?= "-smp 4" |
30 | QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" | 30 | QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" |
31 | QB_MACHINE = "-machine virt" | 31 | QB_MACHINE = "-machine virt" |
32 | QB_DEFAULT_BIOS = "fw_jump.elf" | 32 | QB_DEFAULT_BIOS = "fw_jump.elf" |
diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index 3953679366..dd7e7c9384 100644 --- a/meta/conf/machine/include/x86/qemuboot-x86.inc +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | # For runqemu | 1 | # For runqemu |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_SMP = "-smp 4" | 3 | QB_SMP ?= "-smp 4" |
4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" | 4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" | 5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
6 | 6 | ||
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 1bd4e3e154..c5234231e2 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -16,7 +16,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
16 | QB_SYSTEM_NAME = "qemu-system-arm" | 16 | QB_SYSTEM_NAME = "qemu-system-arm" |
17 | QB_MACHINE = "-machine virt,highmem=off" | 17 | QB_MACHINE = "-machine virt,highmem=off" |
18 | QB_CPU = "-cpu cortex-a15" | 18 | QB_CPU = "-cpu cortex-a15" |
19 | QB_SMP = "-smp 4" | 19 | QB_SMP ?= "-smp 4" |
20 | # Standard Serial console | 20 | # Standard Serial console |
21 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" | 21 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" |
22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index ffc51c803f..2f0f0e4f84 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -16,7 +16,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
16 | QB_SYSTEM_NAME = "qemu-system-aarch64" | 16 | QB_SYSTEM_NAME = "qemu-system-aarch64" |
17 | QB_MACHINE = "-machine virt" | 17 | QB_MACHINE = "-machine virt" |
18 | QB_CPU = "-cpu cortex-a57" | 18 | QB_CPU = "-cpu cortex-a57" |
19 | QB_SMP = "-smp 4" | 19 | QB_SMP ?= "-smp 4" |
20 | QB_CPU_KVM = "-cpu host -machine gic-version=3" | 20 | QB_CPU_KVM = "-cpu host -machine gic-version=3" |
21 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 21 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
22 | QB_GRAPHICS = "-device virtio-gpu-pci" | 22 | QB_GRAPHICS = "-device virtio-gpu-pci" |
diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf index 7709339313..2fbd26a6f9 100644 --- a/meta/conf/machine/qemuppc64.conf +++ b/meta/conf/machine/qemuppc64.conf | |||
@@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;hvc0" | |||
13 | QB_SYSTEM_NAME = "qemu-system-ppc64" | 13 | QB_SYSTEM_NAME = "qemu-system-ppc64" |
14 | QB_MACHINE = "-machine pseries" | 14 | QB_MACHINE = "-machine pseries" |
15 | QB_CPU = "-cpu POWER9" | 15 | QB_CPU = "-cpu POWER9" |
16 | QB_SMP = "-smp 2" | 16 | QB_SMP ?= "-smp 2" |
17 | 17 | ||
18 | QB_NFSROOTFS_EXTRA_OPT = "wsize=524288,rsize=524288" | 18 | QB_NFSROOTFS_EXTRA_OPT = "wsize=524288,rsize=524288" |
19 | QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc" | 19 | QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc" |