rename RouterStation stuff, and add machine type for the LSX board

SVN-Revision: 13694
master
Gabor Juhos 16 years ago
parent 85d59fbf8c
commit 91491c6e37
  1. 2
      target/linux/ar71xx/config-2.6.26
  2. 2
      target/linux/ar71xx/config-2.6.27
  3. 1
      target/linux/ar71xx/config-2.6.28
  4. 3
      target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h
  5. 4
      target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
  6. 2
      target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
  7. 4
      target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
  8. 3
      target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h

@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_RB_4XX=y
CONFIG_AR71XX_MACH_ROUTERSTATION=y
CONFIG_AR71XX_MACH_TEW_632BRP=y CONFIG_AR71XX_MACH_TEW_632BRP=y
CONFIG_AR71XX_MACH_UBNT=y
CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_MACH_WP543=y
CONFIG_AR71XX_WDT=y CONFIG_AR71XX_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set

@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_RB_4XX=y
CONFIG_AR71XX_MACH_ROUTERSTATION=y
CONFIG_AR71XX_MACH_TEW_632BRP=y CONFIG_AR71XX_MACH_TEW_632BRP=y
CONFIG_AR71XX_MACH_UBNT=y
CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_MACH_WP543=y
CONFIG_AR71XX_WDT=y CONFIG_AR71XX_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set

@ -9,6 +9,7 @@ CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_RB_4XX=y
CONFIG_AR71XX_MACH_TEW_632BRP=y CONFIG_AR71XX_MACH_TEW_632BRP=y
CONFIG_AR71XX_MACH_UBNT=y
CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_MACH_WP543=y
CONFIG_AR71XX_WDT=y CONFIG_AR71XX_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set

@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type;
#define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */
#define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */
#define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ #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 * PLL block

@ -31,8 +31,8 @@ config AR71XX_MACH_TEW_632BRP
bool "TRENDnet TEW-632BRP support" bool "TRENDnet TEW-632BRP support"
default y default y
config AR71XX_MACH_ROUTERSTATION config AR71XX_MACH_UBNT
bool "Ubiquiti RouterStation support" bool "Ubiquiti AR71xx based boards support"
default y default y
endmenu endmenu

@ -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_AW_NR580) += mach-aw-nr580.o
obj-$(CONFIG_AR71XX_MACH_GENERIC) += mach-generic.o obj-$(CONFIG_AR71XX_MACH_GENERIC) += mach-generic.o
obj-$(CONFIG_AR71XX_MACH_RB_4XX) += mach-rb-4xx.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_TEW_632BRP) += mach-tew-632brp.o
obj-$(CONFIG_AR71XX_MACH_UBNT) += mach-ubnt.o
obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o

@ -33,5 +33,5 @@ static void __init routerstation_setup(void)
ARRAY_SIZE(routerstation_spi_info)); ARRAY_SIZE(routerstation_spi_info));
} }
MIPS_MACHINE(AR71XX_MACH_ROUTERSTATION, "Ubiquiti RouterStation", MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "Ubiquiti RouterStation",
routerstation_setup); routerstation_setup);

@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type;
#define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */
#define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */
#define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ #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 * PLL block

Loading…
Cancel
Save