diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-03-03 21:59:34 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-03-03 21:59:34 +0000 |
| commit | a5ebfc79ba93446ea576153c77f74d41c53c4d56 (patch) | |
| tree | b864216a97218c97a34d0246536ae1d93f798c13 /target/linux/ar71xx/patches-3.8 | |
| parent | 7f0cc47d8575d68bab55ad3d192f0815dced6a4a (diff) | |
| download | upstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.tar.gz upstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.tar.bz2 upstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.zip | |
ar71xx: rework changes from r35840
Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35865
Diffstat (limited to 'target/linux/ar71xx/patches-3.8')
4 files changed, 10 insertions, 21 deletions
diff --git a/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch index bdf8c2be23..73253bb5ab 100644 --- a/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -16,22 +16,113 @@ +@@ -16,22 +16,112 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, @@ -108,7 +108,6 @@ + ATH79_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */ + ATH79_MACH_WZR_HP_G300NH2, /* Buffalo WZR-HP-G300NH2 */ + ATH79_MACH_WZR_HP_G450H, /* Buffalo WZR-HP-G450H */ -+ ATH79_MACH_WZR_600DHP, /* Buffalo WZR-600DHP */ + ATH79_MACH_ZCN_1523H_2, /* Zcomax ZCN-1523H-2-xx */ + ATH79_MACH_ZCN_1523H_5, /* Zcomax ZCN-1523H-5-xx */ }; @@ -217,7 +216,7 @@ config ATH79_MACH_PB44 bool "Atheros PB44 reference board" select SOC_AR71XX -@@ -68,6 +148,497 @@ config ATH79_MACH_PB44 +@@ -68,6 +148,488 @@ config ATH79_MACH_PB44 Say 'Y' here if you want your kernel to support the Atheros PB44 reference board. @@ -294,15 +293,6 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + -+config ATH79_MACH_WZR_600DHP -+ bool "Buffalo WZR-600DHP board support" -+ select SOC_AR71XX -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB -+ +config ATH79_MACH_WP543 + bool "Compex WP543/WPJ543 board support" + select SOC_AR71XX @@ -715,7 +705,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" select SOC_AR724X -@@ -83,6 +654,24 @@ config ATH79_MACH_UBNT_XM +@@ -83,6 +645,24 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -740,7 +730,7 @@ endmenu config SOC_AR71XX -@@ -118,10 +707,6 @@ config SOC_QCA955X +@@ -118,10 +698,6 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n @@ -751,7 +741,7 @@ config ATH79_DEV_AP9X_PCI select ATH79_PCI_ATH9K_FIXUP def_bool n -@@ -132,7 +717,14 @@ config ATH79_DEV_DSA +@@ -132,7 +708,14 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -767,7 +757,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -164,4 +756,7 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -164,4 +747,7 @@ config ATH79_PCI_ATH9K_FIXUP config ATH79_ROUTERBOOT def_bool n @@ -777,7 +767,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -38,9 +38,72 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,71 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # @@ -847,7 +837,6 @@ +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2) += mach-wzr-hp-g300nh2.o +obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H) += mach-wzr-hp-ag300h.o +obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H) += mach-wzr-hp-g450h.o -+obj-$(CONFIG_ATH79_MACH_WZR_600DHP) += mach-wzr-hp-ag300h.o +obj-$(CONFIG_ATH79_MACH_ZCN_1523H) += mach-zcn-1523h.o + --- a/arch/mips/ath79/prom.c diff --git a/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch b/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch index 5722ed1fb6..5d6f5cb226 100644 --- a/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch +++ b/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch @@ -10,7 +10,7 @@ ATH79_MACH_EAP7660D, /* Senao EAP7660D */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -292,6 +292,17 @@ config ATH79_MACH_DIR_825_B1 +@@ -283,6 +283,17 @@ config ATH79_MACH_DIR_825_B1 select ATH79_DEV_M25P80 select ATH79_DEV_USB diff --git a/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch b/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch index cc60e78e43..0a2c3bda51 100644 --- a/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch +++ b/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch @@ -10,7 +10,7 @@ ATH79_MACH_TL_WR1043ND, /* TP-LINK TL-WR1043ND */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -523,6 +523,17 @@ config ATH79_MACH_TL_WA901ND_V2 +@@ -514,6 +514,17 @@ config ATH79_MACH_TL_WA901ND_V2 select ATH79_DEV_M25P80 select ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch b/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch index 07bf886793..e679717366 100644 --- a/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch +++ b/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch @@ -10,7 +10,7 @@ ATH79_MACH_RW2458N, /* Redwave RW2458N */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -369,6 +369,16 @@ config ATH79_MACH_RB750 +@@ -360,6 +360,16 @@ config ATH79_MACH_RB750 select ATH79_ROUTERBOOT select RLE_DECOMPRESS |