diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-11 18:25:36 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-12 15:04:09 +0200 |
| commit | a7e68927d047c5c979a2bf7e9203e9da72ee80e7 (patch) | |
| tree | 4becc0c792e4d9419b8f6259d4800aa817770358 /target/linux/mpc85xx/patches-4.14 | |
| parent | f2f7cc67e546c6f93a821d25b18c095996a27547 (diff) | |
| download | upstream-a7e68927d047c5c979a2bf7e9203e9da72ee80e7.tar.gz upstream-a7e68927d047c5c979a2bf7e9203e9da72ee80e7.tar.bz2 upstream-a7e68927d047c5c979a2bf7e9203e9da72ee80e7.zip | |
kernel: bump 4.14 to 4.14.125 (FS#2305 FS#2297)
Refreshed all patches.
This bump contains upstream commits which seem to avoid (not properly fix)
the errors as seen in FS#2305 and FS#2297
Altered patches:
- 403-net-mvneta-convert-to-phylink.patch
- 410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch
Compile-tested on: ar71xx, cns3xxx, imx6, mvebu, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mpc85xx/patches-4.14')
| -rw-r--r-- | target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch | 17 | ||||
| -rw-r--r-- | target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch index f74ed6fd8a..86b6a57735 100644 --- a/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -17,11 +17,9 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> arch/powerpc/platforms/85xx/Makefile | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index e2a5a932c24a..925140f8350b 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -156,6 +156,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S +@@ -156,6 +156,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c @@ -29,7 +27,7 @@ index e2a5a932c24a..925140f8350b 100644 src-wlib := $(sort $(src-wlib-y)) src-plat := $(sort $(src-plat-y)) -@@ -335,7 +336,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm8555 +@@ -335,7 +336,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_SBC8548) += cuImage.sbc8548 image-$(CONFIG_KSI8560) += cuImage.ksi8560 @@ -38,8 +36,6 @@ index e2a5a932c24a..925140f8350b 100644 # Board ports in arch/powerpc/platform/86xx/Kconfig image-$(CONFIG_MVME7100) += dtbImage.mvme7100 -diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper -index 76fe3ccfd381..96fd853a1ed0 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -302,6 +302,11 @@ adder875-redboot) @@ -54,8 +50,6 @@ index 76fe3ccfd381..96fd853a1ed0 100755 simpleboot-virtex405-*) platformo="$object/virtex405-head.o $object/simpleboot.o $object/virtex.o" binary=y -diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig -index 68920d42b4bc..477782740f0e 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -170,6 +170,17 @@ config STX_GP3 @@ -76,11 +70,9 @@ index 68920d42b4bc..477782740f0e 100644 config TQM8540 bool "TQ Components TQM8540" help -diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile -index d1dd0dca5ebf..d0dab29a33eb 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -26,6 +26,7 @@ obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_CORENET_GENERIC) += coren obj-$(CONFIG_FB_FSL_DIU) += t1042rdb_diu.o obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o @@ -88,6 +80,3 @@ index d1dd0dca5ebf..d0dab29a33eb 100644 obj-$(CONFIG_SBC8548) += sbc8548.o obj-$(CONFIG_PPA8548) += ppa8548.o obj-$(CONFIG_SOCRATES) += socrates.o socrates_fpga_pic.o --- -2.20.1 - 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 6a16a34a18..69dd1305d7 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,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -835,6 +835,14 @@ config CMDLINE_FORCE +@@ -836,6 +836,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. |