runqemu: avoid setting "mem=" when using a DTB

Some emulated machines, such as the Raspberry Pi models, fail to boot
if a fixed "mem=" value is passed on the kernel command line. When a
DTB is used (QB_DTB is set), the memory size is already defined there,
so specifying it again is unnecessary and can cause issues.

Skip adding "mem=" to the kernel command line when QB_DTB is present.

Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/runqemu b/scripts/runqemu
index 2be7a0f2869fa6a173d062ad9b9b7808821e90af..370b45578137bbdc665c5daca169d12c7b121815 100755 (executable)
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -884,7 +884,7 @@ to your build configuration.
         self.set('QB_MEM', qb_mem)
 
         mach = self.get('MACHINE')
-        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')):
+        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')) and self.get('QB_DTB') == "":
             self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M'
 
         self.qemu_opt_script += ' %s' % self.get('QB_MEM')