summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-3.2
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-01-31 18:37:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-01-31 18:37:29 +0000
commitc315ce403bad47c55f162805b258091a3b8164e5 (patch)
treea8989b49d67baaa376f8838efd6bc5e15cd17826 /target/linux/ar71xx/patches-3.2
parentdd47afc197394f9ce1ebe106092c3ac999e9d8bf (diff)
downloadmtk-20170518-c315ce403bad47c55f162805b258091a3b8164e5.zip
mtk-20170518-c315ce403bad47c55f162805b258091a3b8164e5.tar.gz
mtk-20170518-c315ce403bad47c55f162805b258091a3b8164e5.tar.bz2
ar71xx: merge DIR-600 A1 and DIR-615 E4 support
SVN-Revision: 29976
Diffstat (limited to 'target/linux/ar71xx/patches-3.2')
-rw-r--r--target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch17
1 files changed, 3 insertions, 14 deletions
diff --git a/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
index e6542a1..048c763 100644
--- a/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
@@ -188,7 +188,7 @@
config ATH79_MACH_PB44
bool "Atheros PB44 reference board"
select SOC_AR71XX
-@@ -54,6 +137,379 @@ config ATH79_MACH_PB44
+@@ -54,6 +137,369 @@ config ATH79_MACH_PB44
Say 'Y' here if you want your kernel to support the
Atheros PB44 reference board.
@@ -278,7 +278,7 @@
+ select MYLOADER
+
+config ATH79_MACH_DIR_600_A1
-+ bool "D-Link DIR-600 rev. A1 support"
++ bool "D-Link DIR-600 A1/DIR-615 E4 support"
+ select SOC_AR724X
+ select ATH79_DEV_AP9X_PCI if PCI
+ select ATH79_DEV_ETH
@@ -297,16 +297,6 @@
+ select ATH79_DEV_WMAC
+ select ATH79_NVRAM
+
-+config ATH79_MACH_DIR_615_E4
-+ bool "D-Link DIR-615 rev. E4 support"
-+ select SOC_AR724X
-+ select ATH79_DEV_AP9X_PCI if PCI
-+ select ATH79_DEV_ETH
-+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_M25P80
-+ select ATH79_NVRAM
-+
+config ATH79_MACH_DIR_825_B1
+ bool "D-Link DIR-825 rev. B1 board support"
+ select SOC_AR71XX
@@ -630,7 +620,7 @@
endif
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
-@@ -36,8 +36,57 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += p
+@@ -36,8 +36,56 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += p
#
# Machines
#
@@ -646,7 +636,6 @@
obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o
+obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o
+obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o
-+obj-$(CONFIG_ATH79_MACH_DIR_615_E4) += mach-dir-615-e4.o
+obj-$(CONFIG_ATH79_MACH_DIR_825_B1) += mach-dir-825-b1.o
+obj-$(CONFIG_ATH79_MACH_EAP7660D) += mach-eap7660d.o
+obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o