Commit 5e4b563d authored by Andre Przywara's avatar Andre Przywara Committed by Will Deacon
Browse files

arm: Allow command line for firmware



When loading a firmware instead of a kernel, we can still pass on any
*user-provided* command line, as /chosen/bootargs is a generic device tree
feature. We just need to make sure to not pass our mangled-for-Linux
version.

This allows to run "firmware" images which make use of a command line,
still are not Linux kernels, like kvm-unit-tests.
Signed-off-by: Andre Przywara's avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent eb41dfc9
......@@ -132,14 +132,11 @@ static int setup_fdt(struct kvm *kvm)
_FDT(fdt_begin_node(fdt, "chosen"));
_FDT(fdt_property_cell(fdt, "linux,pci-probe-only", 1));
/* Pass on our amended command line to a Linux kernel only. */
if (kvm->cfg.firmware_filename) {
/*
* When using a firmware, command line is not passed through DT,
* or the firmware can add it itself
*/
if (kvm->cfg.kernel_cmdline)
pr_warning("Ignoring custom bootargs: %s\n",
kvm->cfg.kernel_cmdline);
_FDT(fdt_property_string(fdt, "bootargs",
kvm->cfg.kernel_cmdline));
} else
_FDT(fdt_property_string(fdt, "bootargs",
kvm->cfg.real_cmdline));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment