From bd879982fa551d8d16d1d9d5c5261085509ea926 Mon Sep 17 00:00:00 2001 From: Raju Kumar Pothuraju Date: Wed, 15 Jun 2022 18:40:24 +0530 Subject: [PATCH] runqemu: add QB_KERNEL_CMDLINE 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" (From OE-Core rev: 98f4bf980c378cc541b220d79ee006bf2fae9ae8) Signed-off-by: Raju Kumar Pothuraju Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/runqemu | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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: