diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-15 11:19:43 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-16 10:08:56 +0200 |
| commit | 0d0bd8e6da9d93d8b8ae6a936d564fbeb39c6f77 (patch) | |
| tree | b0b89421be71510bfc98bda0d3a6e72eb999d008 /target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch | |
| parent | e80af4b53bc34be2dad0b70b37556d92373c4041 (diff) | |
| download | upstream-0d0bd8e6da9d93d8b8ae6a936d564fbeb39c6f77.tar.gz upstream-0d0bd8e6da9d93d8b8ae6a936d564fbeb39c6f77.tar.bz2 upstream-0d0bd8e6da9d93d8b8ae6a936d564fbeb39c6f77.zip | |
kernel: bump 4.14 to 4.14.76
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.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 | 22 |
1 files changed, 11 insertions, 11 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 index 7f4fa249d0..a3b69bbbb3 100644 --- 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 @@ -1,9 +1,9 @@ --- 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. - + 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 @@ -13,14 +13,14 @@ + cmdline if it exists in the device tree. + config EXTRA_TARGETS - string "Additional default image types" - help + 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)); - + 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 @@ -32,6 +32,6 @@ + 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 + /* + * CONFIG_CMDLINE is meant to be a default in case nothing else + * managed to set the command line, unless CONFIG_CMDLINE_FORCE |