From 6a309b5609876975feaa5621874e2b17509fa50f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Oct 2018 16:25:06 +0800 Subject: [PATCH] kernel update to 4.9.133 and 4.14.76 --- include/kernel-version.mk | 12 +++---- ...mware-loader-for-uPD720201-and-uPD72.patch | 6 ++-- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- ...NFIG_MEMCG-but-leave-it-disabled-due.patch | 4 +-- .../generic/hack-4.14/902-debloat_proc.patch | 2 +- .../generic/hack-4.9/902-debloat_proc.patch | 2 +- ...ment-fix-headroom-tests-and-skb-leak.patch | 8 ++--- ...urce-specific-default-route-handling.patch | 2 +- ...low-imod-interval-to-be-configurable.patch | 2 +- target/linux/mpc85xx/Makefile | 2 +- .../linux/mpc85xx/{config-4.9 => config-4.14} | 18 ++++++----- .../arch/powerpc/boot/dts/tl-wdr4900-v1.dts | 2 +- ...85xx-add-gpio-keys-to-of-match-table.patch | 0 ...0-powerpc-85xx-tl-wdr4900-v1-support.patch | 31 ++++++++++--------- .../101-powerpc-85xx-hiveap-330-support.patch | 20 ++++++------ .../102-powerpc-add-cmdline-override.patch | 26 ++++++++-------- 16 files changed, 72 insertions(+), 67 deletions(-) rename target/linux/mpc85xx/{config-4.9 => config-4.14} (96%) rename target/linux/mpc85xx/{patches-4.9 => patches-4.14}/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch (100%) rename target/linux/mpc85xx/{patches-4.9 => patches-4.14}/100-powerpc-85xx-tl-wdr4900-v1-support.patch (78%) rename target/linux/mpc85xx/{patches-4.9 => patches-4.14}/101-powerpc-85xx-hiveap-330-support.patch (63%) rename target/linux/mpc85xx/{patches-4.9 => patches-4.14}/102-powerpc-add-cmdline-override.patch (51%) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5d5a7ce66..5cb374252 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,13 +2,13 @@ LINUX_RELEASE?=1 -LINUX_VERSION-3.18 = .123 -LINUX_VERSION-4.9 = .132 -LINUX_VERSION-4.14 = .75 +LINUX_VERSION-3.18 = .124 +LINUX_VERSION-4.9 = .133 +LINUX_VERSION-4.14 = .76 -LINUX_KERNEL_HASH-3.18.123 = c10de32c9b31fb619b016a00d77afc394db5a4542e258e927f06a5ead86f8c64 -LINUX_KERNEL_HASH-4.9.132 = 67e66ae14595b3c93f228c417463e5436b9d64f5e9dfd3b92b7e24714d1ee5d3 -LINUX_KERNEL_HASH-4.14.75 = 5093d7230b8f1c553450ca6c1ccd20a46a055d9277a7e161039a8642b3398120 +LINUX_KERNEL_HASH-3.18.124 = 25d2a5abd627534a1e51d028890c184aad8e628c345c5fe0cc0f9d7c31b7a5a3 +LINUX_KERNEL_HASH-4.9.133 = 53730fc025ba330a6f4908a6a1e4cb86d821000c84167721680ccf1b37b26563 +LINUX_KERNEL_HASH-4.14.76 = ee3f19a4ff8a42793c193e361e1d34fcc821a5ca9b58db41befb2b4df0e482be remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch index e8154253a..5d9b1f606 100644 --- a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch +++ b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter #include "xhci.h" #include "xhci-trace.h" -@@ -255,6 +257,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -257,6 +259,458 @@ static void xhci_pme_acpi_rtd3_enable(st static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } #endif /* CONFIG_ACPI */ @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter /* called during probe() after chip reset completes */ static int xhci_pci_setup(struct usb_hcd *hcd) { -@@ -290,6 +744,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -292,6 +746,22 @@ static int xhci_pci_probe(struct pci_dev struct hc_driver *driver; struct usb_hcd *hcd; @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter driver = (struct hc_driver *)id->driver_data; /* For some HW implementation, a XHCI reset is just not enough... */ -@@ -354,6 +824,16 @@ static void xhci_pci_remove(struct pci_d +@@ -356,6 +826,16 @@ static void xhci_pci_remove(struct pci_d { struct xhci_hcd *xhci; diff --git a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch index c09d1547b..141b839d6 100644 --- a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -213,7 +213,7 @@ static void xhci_pci_quirks(struct devic +@@ -215,7 +215,7 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0015) diff --git a/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch index 016d9cd99..5dc823336 100644 --- a/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ b/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch @@ -10,7 +10,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5632,7 +5632,7 @@ int __init cgroup_init_early(void) +@@ -5636,7 +5636,7 @@ int __init cgroup_init_early(void) return 0; } @@ -19,7 +19,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to /** * cgroup_init - cgroup initialization -@@ -6173,6 +6173,28 @@ static int __init cgroup_no_v1(char *str +@@ -6177,6 +6177,28 @@ static int __init cgroup_no_v1(char *str } __setup("cgroup_no_v1=", cgroup_no_v1); diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index e89786b47..54c9bd40a 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau } --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1944,10 +1944,12 @@ void __init init_mm_internals(void) +@@ -1947,10 +1947,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index cab7276d2..cff616808 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau } --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1796,10 +1796,12 @@ static int __init setup_vmstat(void) +@@ -1799,10 +1799,12 @@ static int __init setup_vmstat(void) cpu_notifier_register_done(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/pending-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch b/target/linux/generic/pending-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch index 51f31ea06..899006130 100644 --- a/target/linux/generic/pending-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch +++ b/target/linux/generic/pending-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch @@ -44,7 +44,7 @@ Closes 20532 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -602,20 +602,22 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -603,20 +603,22 @@ int ip6_fragment(struct sk_buff *skb, in } mtu -= hlen + sizeof(struct frag_hdr); @@ -69,7 +69,7 @@ Closes 20532 goto slow_path_clean; /* Partially cloned skb? */ -@@ -632,8 +634,6 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -633,8 +635,6 @@ int ip6_fragment(struct sk_buff *skb, in err = 0; offset = 0; @@ -78,7 +78,7 @@ Closes 20532 /* BUILD HEADER */ *prevhdr = NEXTHDR_FRAGMENT; -@@ -641,8 +641,11 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -642,8 +642,11 @@ int ip6_fragment(struct sk_buff *skb, in if (!tmp_hdr) { IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_FRAGFAILS); @@ -91,7 +91,7 @@ Closes 20532 __skb_pull(skb, hlen); fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct frag_hdr)); -@@ -740,7 +743,6 @@ slow_path: +@@ -741,7 +744,6 @@ slow_path: */ *prevhdr = NEXTHDR_FRAGMENT; diff --git a/target/linux/generic/pending-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch b/target/linux/generic/pending-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch index 95d357813..61612cecb 100644 --- a/target/linux/generic/pending-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch +++ b/target/linux/generic/pending-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -908,21 +908,45 @@ static int ip6_dst_lookup_tail(struct so +@@ -909,21 +909,45 @@ static int ip6_dst_lookup_tail(struct so #endif int err; diff --git a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch index 523048773..ded3916c5 100644 --- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch +++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman if (!xhci->shared_hcd) { --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -266,6 +266,9 @@ static int xhci_pci_setup(struct usb_hcd +@@ -268,6 +268,9 @@ static int xhci_pci_setup(struct usb_hcd if (!xhci->sbrn) pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn); diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index b181e67c0..1eac54434 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz SUBTARGETS:=generic p1020 -KERNEL_PATCHVER:=4.9 +KERNEL_PATCHVER:=4.14 KERNELNAME:=zImage diff --git a/target/linux/mpc85xx/config-4.9 b/target/linux/mpc85xx/config-4.14 similarity index 96% rename from target/linux/mpc85xx/config-4.9 rename to target/linux/mpc85xx/config-4.14 index 68568c4a6..0bdf7aa25 100644 --- a/target/linux/mpc85xx/config-4.9 +++ b/target/linux/mpc85xx/config-4.14 @@ -16,6 +16,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS=11 # CONFIG_ARCH_RANDOM is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y @@ -47,16 +48,16 @@ CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y -CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y +#CONFIG_CRYPTO_DEV_FSL_CAAM=y +#CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y +#CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set -CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y -CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y -CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 -CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y +#CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y +#CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y +#CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 +#CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HW=y @@ -243,6 +244,7 @@ CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set CONFIG_PCIEPORTBUS=y CONFIG_PCI_DOMAINS=y CONFIG_PGTABLE_LEVELS=2 @@ -283,6 +285,7 @@ CONFIG_PPC_MMU_NOHASH=y # CONFIG_PPC_MPC106 is not set # CONFIG_PPC_P7_NAP is not set CONFIG_PPC_PCI_CHOICE=y +# CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QEMU_E500 is not set # CONFIG_PPC_RTAS is not set CONFIG_PPC_SMP_MUXED_IPI=y @@ -330,6 +333,7 @@ CONFIG_SWPHY=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_TASK_SIZE=0xc0000000 CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_THREAD_SHIFT=13 # CONFIG_TL_WDR4900_V1 is not set # CONFIG_TQM8540 is not set # CONFIG_TQM8541 is not set diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts index bde5eb957..c54cab951 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts @@ -18,7 +18,7 @@ chosen { bootargs = "console=ttyS0,115200"; /* - linux,stdout-path = "/soc@ffe00000/serial@4500"; + stdout-path = "/soc@ffe00000/serial@4500"; */ }; diff --git a/target/linux/mpc85xx/patches-4.9/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch similarity index 100% rename from target/linux/mpc85xx/patches-4.9/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch rename to target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch diff --git a/target/linux/mpc85xx/patches-4.9/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch similarity index 78% rename from target/linux/mpc85xx/patches-4.9/100-powerpc-85xx-tl-wdr4900-v1-support.patch rename to target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch index 3797ae258..8b627fb72 100644 --- a/target/linux/mpc85xx/patches-4.9/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -17,7 +17,7 @@ Signed-off-by: Gabor Juhos --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -138,6 +138,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie +@@ -151,6 +151,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 @@ -25,14 +25,15 @@ Signed-off-by: Gabor Juhos src-wlib := $(sort $(src-wlib-y)) src-plat := $(sort $(src-plat-y)) -@@ -321,6 +322,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm +@@ -330,7 +331,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_SBC8548) += cuImage.sbc8548 image-$(CONFIG_KSI8560) += cuImage.ksi8560 +- +image-$(CONFIG_TL_WDR4900_V1) += cuImage.tl-wdr4900-v1 - # Board ports in arch/powerpc/platform/86xx/Kconfig image-$(CONFIG_MVME7100) += dtbImage.mvme7100 + --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -277,6 +277,10 @@ cuboot*) @@ -41,35 +42,35 @@ Signed-off-by: Gabor Juhos ;; + *-tl-wdr4900-v1) + platformo=$object/cuboot-tl-wdr4900-v1.o -+ link_address='0x1000000' ++ link_address='0x1000000' + ;; *-amigaone) link_address='0x800000' ;; --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig -@@ -169,6 +169,17 @@ config STX_GP3 +@@ -170,6 +170,17 @@ config STX_GP3 select CPM2 select DEFAULT_UIMAGE +config TL_WDR4900_V1 -+ bool "TP-Link TL-WDR4900 v1" -+ select DEFAULT_UIMAGE -+ select ARCH_REQUIRE_GPIOLIB -+ select GPIO_MPC8XXX -+ help -+ This option enables support for the TP-Link TL-WDR4900 v1 board. ++ bool "TP-Link TL-WDR4900 v1" ++ select DEFAULT_UIMAGE ++ select ARCH_REQUIRE_GPIOLIB ++ select GPIO_MPC8XXX ++ help ++ This option enables support for the TP-Link TL-WDR4900 v1 board. + -+ This board is a Concurrent Dual-Band wireless router with a -+ Freescale P1014 SoC. ++ This board is a Concurrent Dual-Band wireless router with a ++ Freescale P1014 SoC. + config TQM8540 bool "TQ Components TQM8540" help --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_TWR_P102x) += twr_p102x.o - 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 +obj-$(CONFIG_TL_WDR4900_V1) += tl_wdr4900_v1.o diff --git a/target/linux/mpc85xx/patches-4.9/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch similarity index 63% rename from target/linux/mpc85xx/patches-4.9/101-powerpc-85xx-hiveap-330-support.patch rename to target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch index ece8c7d80..34568398c 100644 --- a/target/linux/mpc85xx/patches-4.9/101-powerpc-85xx-hiveap-330-support.patch +++ b/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch @@ -1,26 +1,26 @@ --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig -@@ -48,6 +48,17 @@ config BSC9132_QDS +@@ -49,6 +49,17 @@ config BSC9132_QDS and dual StarCore SC3850 DSP cores. Manufacturer : Freescale Semiconductor, Inc +config HIVEAP_330 -+ bool "Aerohive HiveAP-330" -+ select DEFAULT_UIMAGE -+ select ARCH_REQUIRE_GPIOLIB -+ select GPIO_MPC8XXX -+ help -+ This option enables support for the Aerohive HiveAP-330 board. ++ bool "Aerohive HiveAP-330" ++ select DEFAULT_UIMAGE ++ select ARCH_REQUIRE_GPIOLIB ++ select GPIO_MPC8XXX ++ help ++ This option enables support for the Aerohive HiveAP-330 board. + -+ This board is a Concurrent Dual-Band wireless access point with a -+ Freescale P1020 SoC. ++ This board is a Concurrent Dual-Band wireless access point with a ++ Freescale P1020 SoC. + config MPC8540_ADS bool "Freescale MPC8540 ADS" select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile -@@ -9,6 +9,7 @@ obj-y += common.o +@@ -10,6 +10,7 @@ obj-y += common.o obj-$(CONFIG_BSC9131_RDB) += bsc913x_rdb.o obj-$(CONFIG_BSC9132_QDS) += bsc913x_qds.o obj-$(CONFIG_C293_PCIE) += c293pcie.o diff --git a/target/linux/mpc85xx/patches-4.9/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch similarity index 51% rename from target/linux/mpc85xx/patches-4.9/102-powerpc-add-cmdline-override.patch rename to target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch index 55976c32b..a3b69bbbb 100644 --- a/target/linux/mpc85xx/patches-4.9/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch @@ -1,31 +1,31 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -708,6 +708,14 @@ config CMDLINE_FORCE +@@ -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. ++ 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 -@@ -1082,6 +1082,17 @@ int __init early_init_dt_scan_chosen(uns +@@ -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. -+ */ ++ /* 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)