diff options
author | John Audia <therealgraysky@proton.me> | 2022-09-15 08:07:08 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-17 14:16:37 +0200 |
commit | fe209fa47d4f360ed0052e0029ba6b3cf8bc9780 (patch) | |
tree | 325270b59a0f6e0238ddfe499d90727c427ba0bb /target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch | |
parent | e785ca05e9f0502894772f5df92192b816ba5d7c (diff) | |
download | upstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.tar.gz upstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.tar.bz2 upstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.zip |
kernel: bump 5.15 to 5.15.68
All patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch')
-rw-r--r-- | target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch index c8803d8428..0d26dc8501 100644 --- a/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch @@ -1,7 +1,5 @@ -Index: linux-5.15.67/arch/powerpc/Kconfig -=================================================================== ---- linux-5.15.67.orig/arch/powerpc/Kconfig -+++ linux-5.15.67/arch/powerpc/Kconfig +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig @@ -915,6 +915,14 @@ config CMDLINE_FORCE endchoice @@ -17,10 +15,8 @@ Index: linux-5.15.67/arch/powerpc/Kconfig config EXTRA_TARGETS string "Additional default image types" help -Index: linux-5.15.67/drivers/of/fdt.c -=================================================================== ---- linux-5.15.67.orig/drivers/of/fdt.c -+++ linux-5.15.67/drivers/of/fdt.c +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c @@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns if (p != NULL && l > 0) strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); |