diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-17 19:01:16 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-17 19:01:16 +0000 |
commit | 5ba480d599b263bce7dcb94ad3c1f77e65fcd393 (patch) | |
tree | 929a96e23a2cb0ed51305f83ce9454b273656b19 /target/linux/ar71xx | |
parent | af42a09bc45c7909cb0cd6a8d42e42a6fa5d1aa3 (diff) | |
download | upstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.tar.gz upstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.tar.bz2 upstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.zip |
CC: kernel: update 3.18 to 3.18.20
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46680 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
8 files changed, 22 insertions, 30 deletions
diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index f11b2d090e..941cb49f30 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1,7 +1,5 @@ -Index: linux-3.18.19/arch/mips/ath79/machtypes.h -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/machtypes.h -+++ linux-3.18.19/arch/mips/ath79/machtypes.h +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h @@ -16,22 +16,195 @@ enum ath79_mach_type { @@ -198,10 +196,8 @@ Index: linux-3.18.19/arch/mips/ath79/machtypes.h }; #endif /* _ATH79_MACHTYPE_H */ -Index: linux-3.18.19/arch/mips/ath79/Kconfig -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/Kconfig -+++ linux-3.18.19/arch/mips/ath79/Kconfig +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig @@ -2,6 +2,70 @@ if ATH79 menu "Atheros AR71XX/AR724X/AR913X machine selection" @@ -1454,10 +1450,8 @@ Index: linux-3.18.19/arch/mips/ath79/Kconfig def_bool n endif -Index: linux-3.18.19/arch/mips/ath79/Makefile -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/Makefile -+++ linux-3.18.19/arch/mips/ath79/Makefile +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile @@ -38,9 +38,124 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines @@ -1583,10 +1577,8 @@ Index: linux-3.18.19/arch/mips/ath79/Makefile +obj-$(CONFIG_ATH79_MACH_ZCN_1523H) += mach-zcn-1523h.o +obj-$(CONFIG_ATH79_MACH_CARAMBOLA2) += mach-carambola2.o +obj-$(CONFIG_ATH79_MACH_NBG6716) += mach-nbg6716.o -Index: linux-3.18.19/arch/mips/ath79/prom.c -=================================================================== ---- linux-3.18.19.orig/arch/mips/ath79/prom.c -+++ linux-3.18.19/arch/mips/ath79/prom.c +--- a/arch/mips/ath79/prom.c ++++ b/arch/mips/ath79/prom.c @@ -180,6 +180,12 @@ void __init prom_init(void) ath79_prom_append_cmdline("board", env); } diff --git a/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch index a24d496529..b44e88492b 100644 --- a/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch +++ b/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch @@ -22,7 +22,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed. --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1218,6 +1218,10 @@ config SOC_AR934X +@@ -1228,6 +1228,10 @@ config SOC_AR934X select PCI_AR724X if PCI def_bool n @@ -33,7 +33,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed. config SOC_QCA955X select HW_HAS_PCI select PCI_AR724X if PCI -@@ -1260,7 +1264,7 @@ config ATH79_DEV_USB +@@ -1270,7 +1274,7 @@ config ATH79_DEV_USB def_bool n config ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch index 90c9b3355c..8f15790e30 100644 --- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch +++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch @@ -445,7 +445,7 @@ } --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1237,6 +1237,12 @@ config SOC_QCA955X +@@ -1248,6 +1248,12 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n @@ -458,7 +458,7 @@ config ATH79_DEV_M25P80 select ATH79_DEV_SPI def_bool n -@@ -1274,7 +1280,7 @@ config ATH79_DEV_USB +@@ -1285,7 +1291,7 @@ config ATH79_DEV_USB def_bool n config ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch b/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch index e22c26fba8..b9e1f7e837 100644 --- a/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch +++ b/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -578,6 +578,16 @@ config ATH79_MACH_R6100 +@@ -579,6 +579,16 @@ config ATH79_MACH_R6100 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -119,6 +119,7 @@ enum ath79_mach_type { +@@ -120,6 +120,7 @@ enum ath79_mach_type { ATH79_MACH_TEW_673GRU, /* TRENDnet TEW-673GRU */ ATH79_MACH_TEW_712BR, /* TRENDnet TEW-712BR */ ATH79_MACH_TEW_732BR, /* TRENDnet TEW-732BR */ diff --git a/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch b/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch index a8ee6f6a56..c77831f284 100644 --- a/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch +++ b/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch @@ -6,11 +6,11 @@ ATH79_MACH_OM2P, /* OpenMesh OM2P */ + ATH79_MACH_OM5P_AN, /* OpenMesh OM5P-AN */ ATH79_MACH_OM5P, /* OpenMesh OM5P */ + ATH79_MACH_ONION_OMEGA, /* ONION OMEGA */ ATH79_MACH_PB42, /* Atheros PB42 */ - ATH79_MACH_PB92, /* Atheros PB92 */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -731,6 +731,7 @@ config ATH79_MACH_OM2P +@@ -732,6 +732,7 @@ config ATH79_MACH_OM2P config ATH79_MACH_OM5P bool "OpenMesh OM5P board support" select SOC_AR934X diff --git a/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch b/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch index 22e9b949f8..4e65e0e6d7 100644 --- a/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch +++ b/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch @@ -1,7 +1,7 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -738,6 +738,26 @@ config ATH79_MACH_OM5P - select ATH79_DEV_M25P80 +@@ -749,6 +749,26 @@ config ATH79_MACH_ONION_OMEGA + select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_MR12 diff --git a/target/linux/ar71xx/patches-3.18/800-MIPS-ath79-add-RB922GS-support.patch b/target/linux/ar71xx/patches-3.18/800-MIPS-ath79-add-RB922GS-support.patch index a08a30f22f..7f1ac451eb 100644 --- a/target/linux/ar71xx/patches-3.18/800-MIPS-ath79-add-RB922GS-support.patch +++ b/target/linux/ar71xx/patches-3.18/800-MIPS-ath79-add-RB922GS-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -613,6 +613,16 @@ config ATH79_MACH_RB91X +@@ -614,6 +614,16 @@ config ATH79_MACH_RB91X select ATH79_DEV_USB select ATH79_ROUTERBOOT @@ -19,7 +19,7 @@ select SOC_AR934X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -101,6 +101,7 @@ obj-$(CONFIG_ATH79_MACH_R6100) += mach- +@@ -102,6 +102,7 @@ obj-$(CONFIG_ATH79_MACH_R6100) += mach- obj-$(CONFIG_ATH79_MACH_RB4XX) += mach-rb4xx.o obj-$(CONFIG_ATH79_MACH_RB750) += mach-rb750.o obj-$(CONFIG_ATH79_MACH_RB91X) += mach-rb91x.o @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_RBSXTLITE) += mach-rbsxtlite.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -108,6 +108,7 @@ enum ath79_mach_type { +@@ -109,6 +109,7 @@ enum ath79_mach_type { ATH79_MACH_RB_750G_R3, /* MikroTik RouterBOARD 750GL */ ATH79_MACH_RB_751, /* MikroTik RouterBOARD 751 */ ATH79_MACH_RB_751G, /* Mikrotik RouterBOARD 751G */ diff --git a/target/linux/ar71xx/patches-3.18/903-MIPS-ath79-ubnt-rocket-m-xw-support.patch b/target/linux/ar71xx/patches-3.18/903-MIPS-ath79-ubnt-rocket-m-xw-support.patch index 7fdefd65d5..a0fc34f562 100644 --- a/target/linux/ar71xx/patches-3.18/903-MIPS-ath79-ubnt-rocket-m-xw-support.patch +++ b/target/linux/ar71xx/patches-3.18/903-MIPS-ath79-ubnt-rocket-m-xw-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -174,6 +174,7 @@ enum ath79_mach_type { +@@ -175,6 +175,7 @@ enum ath79_mach_type { ATH79_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */ ATH79_MACH_UBNT_NANO_M_XW, /* Ubiquiti NanoStation M XW */ ATH79_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */ |