summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rwxr-xr-xscripts/runqemu4
5 files changed, 2 insertions, 6 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"
diff --git a/scripts/runqemu b/scripts/runqemu
index e9b83737cb..7705b2b60e 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -755,8 +755,8 @@ class BaseConfig(object):
755 if s: 755 if s:
756 self.set('QB_MEM', '-m %s' % s.group(1)) 756 self.set('QB_MEM', '-m %s' % s.group(1))
757 elif not self.get('QB_MEM'): 757 elif not self.get('QB_MEM'):
758 logger.info('QB_MEM is not set, use 512M by default') 758 logger.info('QB_MEM is not set, use 256M by default')
759 self.set('QB_MEM', '-m 512') 759 self.set('QB_MEM', '-m 256')
760 760
761 # Check and remove M or m suffix 761 # Check and remove M or m suffix
762 qb_mem = self.get('QB_MEM') 762 qb_mem = self.get('QB_MEM')