diff options
| author | Magnus Kroken <mkroken@gmail.com> | 2018-10-06 01:46:22 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-10-11 08:03:56 +0200 |
| commit | c83c1804891ac706f2e82f9d6c0aaf6ba290348a (patch) | |
| tree | 3204894923b23007ea2b2bce988bb8c17cb2a482 /target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch | |
| parent | f4b7dfcc4beede9acd8f503b121aed158e38a11d (diff) | |
| download | upstream-c83c1804891ac706f2e82f9d6c0aaf6ba290348a.tar.gz upstream-c83c1804891ac706f2e82f9d6c0aaf6ba290348a.tar.bz2 upstream-c83c1804891ac706f2e82f9d6c0aaf6ba290348a.zip | |
mpc85xx: add kernel 4.14 support
Based on patches previously submitted by Achim Gottinger:
http://lists.infradead.org/pipermail/openwrt-devel/2018-June/012719.html
Tested on TP-Link TL-WDR4900 v1.
Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Diffstat (limited to 'target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch new file mode 100644 index 0000000000..7f4fa249d0 --- /dev/null +++ b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch @@ -0,0 +1,37 @@ +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -830,6 +830,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 +@@ -1131,6 +1131,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 |