diff options
| author | David Bauer <mail@david-bauer.net> | 2019-12-04 17:35:04 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-28 17:50:46 +0100 |
| commit | 13b1db795f055dbfed5f8658bb7b6ab3a1b801bd (patch) | |
| tree | 342c820e48449f5eaea463cbc6158a3e0e3e6994 /target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch | |
| parent | 1e95f9b3ea8375931bf82b8d102b9410d6eafcfa (diff) | |
| download | upstream-13b1db795f055dbfed5f8658bb7b6ab3a1b801bd.tar.gz upstream-13b1db795f055dbfed5f8658bb7b6ab3a1b801bd.tar.bz2 upstream-13b1db795f055dbfed5f8658bb7b6ab3a1b801bd.zip | |
mpc85xx: add support for kernel 5.4
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch new file mode 100644 index 0000000000..a99555f949 --- /dev/null +++ b/target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch @@ -0,0 +1,37 @@ +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -809,6 +809,14 @@ config CMDLINE_FORCE + This is useful if you cannot or don't want to change the + command-line options your boot loader passes to the kernel. + ++config CMDLINE_OVERRIDE ++ bool "Use alternative cmdline from device tree" ++ help ++ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can ++ be used, this is not a good option for kernels that are shared across ++ devices. This setting enables using "chosen/cmdline-override" as the ++ cmdline if it exists in the device tree. ++ + config EXTRA_TARGETS + string "Additional default image types" + help +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -1091,6 +1091,17 @@ int __init early_init_dt_scan_chosen(uns + if (p != NULL && l > 0) + strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); + ++ /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different ++ * device tree option of chosen/bootargs-override. This is ++ * helpful on boards where u-boot sets bootargs, and is unable ++ * to be modified. ++ */ ++#ifdef CONFIG_CMDLINE_OVERRIDE ++ p = of_get_flat_dt_prop(node, "bootargs-override", &l); ++ if (p != NULL && l > 0) ++ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); ++#endif ++ + /* + * CONFIG_CMDLINE is meant to be a default in case nothing else + * managed to set the command line, unless CONFIG_CMDLINE_FORCE |