From 9c193f60ff6920d1b423749429b212662f35ec38 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 17 Jul 2012 11:35:36 -0400 Subject: [PATCH 121/123] 610-MIPS-ath79-openwrt-machines Import of the above patch from openwrt trunk, as of this commit: ---------- commit c1d79f64eed0a7ac36b5b9bca52275b397bec424 Author: nbd Date: Mon Jul 16 16:26:51 2012 +0000 uboot-ar71xx: fix compile on recent mac os x versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32750 3c298f89-4303-0410-b956-a3cf2f4a3e73 ---------- Path to patch in the repo is: target/linux/ar71xx/patches-3.3 Repo is: git://nbd.name/openwrt.git [PG: Trimmed down to just have Routerstation Pro related content.] Signed-off-by: Paul Gortmaker --- arch/mips/ath79/Kconfig | 25 ++++++++++++++++++++----- arch/mips/ath79/Makefile | 1 + arch/mips/ath79/machtypes.h | 2 ++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig index e4385c5..b735938 100644 --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig @@ -49,6 +49,15 @@ config ATH79_MACH_PB44 Say 'Y' here if you want your kernel to support the Atheros PB44 reference board. +config ATH79_MACH_UBNT + bool "Ubiquiti AR71xx based boards 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_UBNT_XM bool "Ubiquiti Networks XM (rev 1.0) board" select SOC_AR724X @@ -91,10 +100,6 @@ config SOC_AR934X select PCI_AR724X if PCI def_bool n -config ATH79_DEV_M25P80 - select ATH79_DEV_SPI - def_bool n - config ATH79_DEV_AP9X_PCI select ATH79_PCI_ATH9K_FIXUP def_bool n @@ -105,7 +110,14 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n -config PCI_AR724X +config ATH79_DEV_M25P80 + select ATH79_DEV_SPI + def_bool n + +config ATH79_DEV_DSA + def_bool n + +config ATH79_DEV_ETH def_bool n config ATH79_DEV_GPIO_BUTTONS @@ -130,4 +142,7 @@ config ATH79_NVRAM config ATH79_PCI_ATH9K_FIXUP def_bool n +config PCI_AR724X + def_bool n + endif diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile index bd54e8d..367284e 100644 --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile @@ -40,4 +40,5 @@ obj-$(CONFIG_ATH79_MACH_AP121) += mach-ap121.o obj-$(CONFIG_ATH79_MACH_AP81) += mach-ap81.o obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o +obj-$(CONFIG_ATH79_MACH_UBNT) += mach-ubnt.o obj-$(CONFIG_ATH79_MACH_UBNT_XM) += mach-ubnt-xm.o diff --git a/arch/mips/ath79/machtypes.h b/arch/mips/ath79/machtypes.h index ebf0143..b7d45ef 100644 --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h @@ -24,6 +24,8 @@ enum ath79_mach_type { ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ ATH79_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */ ATH79_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */ + ATH79_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */ + ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */ ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */ }; -- 1.7.9.7