diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-03-09 12:39:35 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-03-09 20:43:53 +0100 |
| commit | f9f62d43e448f58d25749efa8b2aabc7f2d51e53 (patch) | |
| tree | 6a69f28d11895bd28e04b580981b23ca3cc7943e /target/linux/mpc85xx/patches-5.4/102-powerpc-add-cmdline-override.patch | |
| parent | e64564920a9fa164e9657942de35333d4299abe0 (diff) | |
| download | upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.tar.gz upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.tar.bz2 upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.zip | |
kernel: bump 5.4 to 5.4.24
Refreshed all patches.
Compile-tested on: imx6
Runtime-tested on: imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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 | 6 |
1 files changed, 3 insertions, 3 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 index a99555f949..b76793421a 100644 --- 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 @@ -1,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -809,6 +809,14 @@ config CMDLINE_FORCE +@@ -883,6 +883,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. @@ -17,9 +17,9 @@ help --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1091,6 +1091,17 @@ int __init early_init_dt_scan_chosen(uns +@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns if (p != NULL && l > 0) - strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); + strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); + /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different + * device tree option of chosen/bootargs-override. This is |