From f83a4482a933ce4b586d81129c8a3f1ed2e263f9 Mon Sep 17 00:00:00 2001 From: Matthias Klein Date: Wed, 4 Aug 2021 10:53:55 +0200 Subject: runqemu: decouple bios and kernel options 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). (From OE-Core rev: 5fc65c9d18679b62b13fead7b91126c665525884) Signed-off-by: Matthias Klein Signed-off-by: Richard Purdie --- scripts/runqemu | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') 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) -- cgit v1.2.3-54-g00ecf