runqemu: add QB_KERNEL_CMDLINE

Message ID 20220615131025.25729-2-raju.kumar-pothuraju@xilinx.com
State Accepted, archived
Commit 98f4bf980c378cc541b220d79ee006bf2fae9ae8
Headers show
Series runqemu: add QB_KERNEL_CMDLINE | expand

Commit Message

Raju Kumar Pothuraju June 15, 2022, 1:10 p.m. UTC
runqemu auto generating the KERNEL_CMDLINE values and specifying using
-append option to qemu boot command which will lead to override the
kernel_cmdline/bootargs which are specified in DTB when using -dtb option.
Add new macro QB_KERNEL_CMDLINE to specify not to add the runqemu
generated KERNEL_CMDLINE values instead use which are in the DTB if
value defined as 'none'.
Add provision to override bootargs using # runqemu bootparams="root=/dev/ram0"

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
---
 scripts/runqemu | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 6e1f073ed2..b4c1ae6d83 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1486,7 +1486,12 @@  class BaseConfig(object):
     def start_qemu(self):
         import shlex
         if self.kernel:
-            kernel_opts = "-kernel %s -append '%s %s %s %s'" % (self.kernel, self.kernel_cmdline,
+            kernel_opts = "-kernel %s" % (self.kernel)
+            if self.get('QB_KERNEL_CMDLINE') == "none":
+                if self.bootparams:
+                    kernel_opts += " -append '%s'" % (self.bootparams)
+            else:
+                kernel_opts += " -append '%s %s %s %s'" % (self.kernel_cmdline,
                                                                 self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND'),
                                                                 self.bootparams)
             if self.dtb: