From b8b15dbe4232183eeae2ca39c45dd711dc9568b2 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 19 Dec 2008 19:17:53 +0000 Subject: [PATCH] [ar71xx] rename RouterStation stuff, and add machine type for the LSX board git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13694 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/config-2.6.26 | 2 +- target/linux/ar71xx/config-2.6.27 | 2 +- target/linux/ar71xx/config-2.6.28 | 1 + .../files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h | 3 ++- target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig | 4 ++-- target/linux/ar71xx/files/arch/mips/ar71xx/Makefile | 2 +- .../arch/mips/ar71xx/{mach-routerstation.c => mach-ubnt.c} | 4 ++-- .../linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h | 3 ++- 8 files changed, 12 insertions(+), 9 deletions(-) rename target/linux/ar71xx/files/arch/mips/ar71xx/{mach-routerstation.c => mach-ubnt.c} (90%) diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26 index f091cdf58..6fe933396 100644 --- a/target/linux/ar71xx/config-2.6.26 +++ b/target/linux/ar71xx/config-2.6.26 @@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_ROUTERSTATION=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27 index 566c8cda5..5cb344df2 100644 --- a/target/linux/ar71xx/config-2.6.27 +++ b/target/linux/ar71xx/config-2.6.27 @@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_ROUTERSTATION=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index 077260dd9..17eafa13d 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -9,6 +9,7 @@ CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h index 87af166d5..8379aedab 100644 --- a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h +++ b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h @@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type; #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ -#define AR71XX_MACH_ROUTERSTATION 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_RS 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_LSX 10 /* Ubiquiti LSX */ /* * PLL block diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig index d16fdb824..66500a94b 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig @@ -31,8 +31,8 @@ config AR71XX_MACH_TEW_632BRP bool "TRENDnet TEW-632BRP support" default y -config AR71XX_MACH_ROUTERSTATION - bool "Ubiquiti RouterStation support" +config AR71XX_MACH_UBNT + bool "Ubiquiti AR71xx based boards support" default y endmenu diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile index f53dc9daf..902cbc353 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile @@ -14,6 +14,6 @@ obj-$(CONFIG_AR71XX_MACH_AP83) += mach-ap83.o obj-$(CONFIG_AR71XX_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_AR71XX_MACH_GENERIC) += mach-generic.o obj-$(CONFIG_AR71XX_MACH_RB_4XX) += mach-rb-4xx.o -obj-$(CONFIG_AR71XX_MACH_ROUTERSTATION) += mach-routerstation.o obj-$(CONFIG_AR71XX_MACH_TEW_632BRP) += mach-tew-632brp.o +obj-$(CONFIG_AR71XX_MACH_UBNT) += mach-ubnt.o obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c similarity index 90% rename from target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c rename to target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c index a8de7117f..b1b18f9d4 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c @@ -33,5 +33,5 @@ static void __init routerstation_setup(void) ARRAY_SIZE(routerstation_spi_info)); } -MIPS_MACHINE(AR71XX_MACH_ROUTERSTATION, "Ubiquiti RouterStation", - routerstation_setup); +MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "Ubiquiti RouterStation", + routerstation_setup); diff --git a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h index 87af166d5..8379aedab 100644 --- a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h +++ b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h @@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type; #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ -#define AR71XX_MACH_ROUTERSTATION 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_RS 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_LSX 10 /* Ubiquiti LSX */ /* * PLL block -- 2.20.1