diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-02 10:32:04 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-02 10:32:04 +0000 |
| commit | 1c45ec1021f520e6db2ddfa5f922fb68c6bc3da5 (patch) | |
| tree | 1ef289182cfad1eb4145d225120be6b9a226f806 /target/linux/ar71xx/patches-3.14 | |
| parent | d5add0371f856007f991687061edb4b46ba56b90 (diff) | |
| download | upstream-1c45ec1021f520e6db2ddfa5f922fb68c6bc3da5.tar.gz upstream-1c45ec1021f520e6db2ddfa5f922fb68c6bc3da5.tar.bz2 upstream-1c45ec1021f520e6db2ddfa5f922fb68c6bc3da5.zip | |
ar71xx: Revert "added board support for compex wpj558"
This reverts commit f7873071561d82e75ba2dc46433a2982fef8ac6f.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44245 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.14')
| -rw-r--r-- | target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch | 5 | ||||
| -rw-r--r-- | target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch | 25 |
2 files changed, 7 insertions, 23 deletions
diff --git a/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch b/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch index 407755e7d6..67c1faf9b0 100644 --- a/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch +++ b/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch @@ -8,7 +8,7 @@ #include "common.h" -@@ -69,6 +70,40 @@ static const char * __init ath79_prom_fi +@@ -69,6 +70,37 @@ static const char * __init ath79_prom_fi return ret; } @@ -29,9 +29,6 @@ + case DEVID_COMPEX_WPE72: + ath79_prom_append_cmdline("board", "WPE72"); + break; -+ case DEVID_COMPEX_WPJ558: -+ ath79_prom_append_cmdline("board", "WPJ558"); -+ break; + default: + pr_warn("prom: unknown device id: %x\n", mylo->did); + return 0; diff --git a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch index b100752f5b..b01c5de1ff 100644 --- a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.14/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,147 @@ +@@ -16,22 +16,146 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, @@ -136,7 +136,6 @@ + ATH79_MACH_WNR612_V2, /* NETGEAR WNR612 v2 */ + ATH79_MACH_WP543, /* Compex WP543 */ + ATH79_MACH_WPE72, /* Compex WPE72 */ -+ ATH79_MACH_WPJ558, /* Compex WPJ558 */ + ATH79_MACH_WRT160NL, /* Linksys WRT160NL */ + ATH79_MACH_WRT400N, /* Linksys WRT400N */ + ATH79_MACH_WZR_HP_AG300H, /* Buffalo WZR-HP-AG300H */ @@ -212,7 +211,7 @@ config ATH79_MACH_AP121 bool "Atheros AP121 reference board" select SOC_AR933X -@@ -11,62 +66,754 @@ config ATH79_MACH_AP121 +@@ -11,62 +66,743 @@ config ATH79_MACH_AP121 select ATH79_DEV_M25P80 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -417,17 +416,6 @@ + select ATH79_DEV_USB + select MYLOADER + -+config ATH79_MACH_WPJ558 -+ bool "Compex WPJ558 board support" -+ select SOC_QCA955X -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC -+ select MYLOADER -+ +config ATH79_MACH_DIR_505_A1 + bool "D-Link DIR-505-A1 support" + select SOC_AR933X @@ -995,7 +983,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" -@@ -83,6 +830,65 @@ config ATH79_MACH_UBNT_XM +@@ -83,6 +819,65 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -1061,7 +1049,7 @@ endmenu config SOC_AR71XX -@@ -132,7 +938,10 @@ config ATH79_DEV_DSA +@@ -132,7 +927,10 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -1073,7 +1061,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -164,4 +973,7 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -164,4 +962,7 @@ config ATH79_PCI_ATH9K_FIXUP config ATH79_ROUTERBOOT def_bool n @@ -1083,7 +1071,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -38,9 +49,92 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,91 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # @@ -1167,7 +1155,6 @@ +obj-$(CONFIG_ATH79_MACH_WNR2200) += mach-wnr2200.o +obj-$(CONFIG_ATH79_MACH_WP543) += mach-wp543.o +obj-$(CONFIG_ATH79_MACH_WPE72) += mach-wpe72.o -+obj-$(CONFIG_ATH79_MACH_WPJ558) += mach-wpj558.o +obj-$(CONFIG_ATH79_MACH_WRT160NL) += mach-wrt160nl.o +obj-$(CONFIG_ATH79_MACH_WRT400N) += mach-wrt400n.o +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH) += mach-wzr-hp-g300nh.o |