mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
901a7fa067
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46150
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -554,6 +554,16 @@ config ATH79_MACH_R6100
|
|
select ATH79_DEV_USB
|
|
select ATH79_DEV_WMAC
|
|
|
|
+config ATH79_MACH_MC_MAC1200R
|
|
+ bool "MERCURY MAC1200R board support"
|
|
+ select SOC_AR934X
|
|
+ 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_DEV_WMAC
|
|
+
|
|
config ATH79_MACH_RB4XX
|
|
bool "MikroTik RouterBOARD 4xx series support"
|
|
select SOC_AR71XX
|
|
--- a/arch/mips/ath79/Makefile
|
|
+++ b/arch/mips/ath79/Makefile
|
|
@@ -78,6 +78,7 @@ obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361) +
|
|
obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o
|
|
obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o
|
|
obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o
|
|
+obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o
|
|
obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o
|
|
obj-$(CONFIG_ATH79_MACH_MR900) += mach-mr900.o
|
|
obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o
|
|
--- a/arch/mips/ath79/machtypes.h
|
|
+++ b/arch/mips/ath79/machtypes.h
|
|
@@ -117,6 +117,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 */
|
|
+ ATH79_MACH_MC_MAC1200R, /* MERCURY MAC1200R*/
|
|
ATH79_MACH_TL_MR10U, /* TP-LINK TL-MR10U */
|
|
ATH79_MACH_TL_MR11U, /* TP-LINK TL-MR11U */
|
|
ATH79_MACH_TL_MR13U, /* TP-LINK TL-MR13U */
|