diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-28 17:24:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-30 17:10:28 +0100 |
commit | b0bad37101129dce533bbc406ace779c4a1aa789 (patch) | |
tree | 1c709648dff33a5aa13761ceffb62e0cee461936 /meta/conf/machine/include | |
parent | 51baa9a3b4948683a962674b4854ceaa06d3eb4f (diff) | |
download | poky-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/conf/machine/include')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/riscv/qemuriscv.inc | 1 |
2 files changed, 0 insertions, 2 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 |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_MEM = "-m 256" | ||
4 | QB_MACHINE = "-machine malta" | 3 | QB_MACHINE = "-machine malta" |
5 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
6 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" | 5 | QB_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 |
26 | QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" | 26 | QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" |
27 | QB_MEM = "-m 512" | ||
28 | QB_MACHINE = "-machine virt" | 27 | QB_MACHINE = "-machine virt" |
29 | QB_DEFAULT_BIOS = "fw_jump.elf" | 28 | QB_DEFAULT_BIOS = "fw_jump.elf" |
30 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 29 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |