summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-28 17:24:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commitb0bad37101129dce533bbc406ace779c4a1aa789 (patch)
tree1c709648dff33a5aa13761ceffb62e0cee461936 /meta
parent51baa9a3b4948683a962674b4854ceaa06d3eb4f (diff)
downloadpoky-b0bad37101129dce533bbc406ace779c4a1aa789.tar.gz
qemu: set default RAM to 256M for all machines
There was a discussion about what amount of RAM is appropriate for a default; the outcome was that for now it is still 256M. Some qemu machine definitions have however set this to 512M so for the sake of treating all architectures fairly, they are reset back to 256M. Also runqemu is adjusted to use 256M if QB_MEM is not set at all. http://lists.openembedded.org/pipermail/openembedded-core/2019-August/285900.html (From OE-Core rev: 04c01b6cc5be3e6d45d0e04571640648a5655a8b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/include/qemuboot-mips.inc1
-rw-r--r--meta/conf/machine/include/riscv/qemuriscv.inc1
-rw-r--r--meta/conf/machine/qemuarm.conf1
-rw-r--r--meta/conf/machine/qemuarm64.conf1
4 files changed, 0 insertions, 4 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc
index a5f9ed821f..1c2b532b48 100644
--- a/meta/conf/machine/include/qemuboot-mips.inc
+++ b/meta/conf/machine/include/qemuboot-mips.inc
@@ -1,6 +1,5 @@
1# For runqemu 1# For runqemu
2IMAGE_CLASSES += "qemuboot" 2IMAGE_CLASSES += "qemuboot"
3QB_MEM = "-m 256"
4QB_MACHINE = "-machine malta" 3QB_MACHINE = "-machine malta"
5QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" 4QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty"
6QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" 5QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet"
diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc
index f1cb62818b..952779e98e 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -24,7 +24,6 @@ UBOOT_ENTRYPOINT_riscv64 = "0x80200000"
24 24
25# qemuboot options 25# qemuboot options
26QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" 26QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi"
27QB_MEM = "-m 512"
28QB_MACHINE = "-machine virt" 27QB_MACHINE = "-machine virt"
29QB_DEFAULT_BIOS = "fw_jump.elf" 28QB_DEFAULT_BIOS = "fw_jump.elf"
30QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" 29QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 0a2c995312..26f40b1419 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
11 11
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
14QB_MEM = "-m 512"
15QB_MACHINE = "-machine virt" 14QB_MACHINE = "-machine virt"
16QB_CPU = "-cpu cortex-a15" 15QB_CPU = "-cpu cortex-a15"
17# Standard Serial console 16# Standard Serial console
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 353ac927d9..ec2a887bdd 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
11 11
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-aarch64" 13QB_SYSTEM_NAME = "qemu-system-aarch64"
14QB_MEM = "-m 512"
15QB_MACHINE = "-machine virt" 14QB_MACHINE = "-machine virt"
16QB_CPU = "-cpu cortex-a57" 15QB_CPU = "-cpu cortex-a57"
17QB_CPU_KVM = "-cpu host" 16QB_CPU_KVM = "-cpu host"