[OE-core][PATCH] runqemu: decouple bios and kernel options

[OE-core][PATCH] runqemu: decouple bios and kernel options

[Matthias Klein]

This will allow the use of a bios (e.g. U-Boot) in combination with
a WIC file (from which U-Boot loads the kernel).

Signed-off-by: Matthias Klein <matthias@extraklein.de>
---
 scripts/runqemu | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 9c92eec030..0976273eb0 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1443,12 +1443,14 @@ class BaseConfig(object):
             kernel_opts = "-kernel %s -append '%s %s %s %s'" % (self.kernel, self.kernel_cmdline,
                                                                 self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND'),
                                                                 self.bootparams)
-            if self.bios:
-                kernel_opts += " -bios %s" % self.bios
             if self.dtb:
                 kernel_opts += " -dtb %s" % self.dtb
         else:
             kernel_opts = ""
+
+        if self.bios:
+            self.qemu_opt += " -bios %s" % self.bios
+
         cmd = "%s %s" % (self.qemu_opt, kernel_opts)
         cmds = shlex.split(cmd)
         logger.info('Running %s\n' % cmd)
-- 
2.30.2

Re: [OE-core][PATCH] runqemu: decouple bios and kernel options

[Michael Opdenacker]

On 8/4/21 10:53 AM, Matthias Klein wrote:
> This will allow the use of a bios (e.g. U-Boot) in combination with
> a WIC file (from which U-Boot loads the kernel).
>
> Signed-off-by: Matthias Klein <matthias@extraklein.de>
> ---
>  scripts/runqemu | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 9c92eec030..0976273eb0 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -1443,12 +1443,14 @@ class BaseConfig(object):
>              kernel_opts = "-kernel %s -append '%s %s %s %s'" % (self.kernel, self.kernel_cmdline,
>                                                                  self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND'),
>                                                                  self.bootparams)
> -            if self.bios:
> -                kernel_opts += " -bios %s" % self.bios
>              if self.dtb:
>                  kernel_opts += " -dtb %s" % self.dtb
>          else:
>              kernel_opts = ""
> +
> +        if self.bios:
> +            self.qemu_opt += " -bios %s" % self.bios
> +
>          cmd = "%s %s" % (self.qemu_opt, kernel_opts)
>          cmds = shlex.split(cmd)
>          logger.info('Running %s\n' % cmd)


Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Thanks!

-- 
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com