summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-18 18:10:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-18 18:10:33 +0000
commitdc54bc58f3a3368dc6735c7263560eaee700bb53 (patch)
tree95b050451643f6dc0e47a200841e47aff1d00044 /target/linux/ar71xx
parente831d25f6b1b63e66fd6408141e86a80b68a9269 (diff)
ar71xx: use a separate board id for rocket m
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c3
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/prom.c7
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h5
3 files changed, 10 insertions, 5 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index 40490bb5d..0653c2f03 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -308,7 +308,8 @@ static void __init ubnt_m_setup(void)
ubnt_m_gpio_buttons);
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_M, "Ubiquiti Bullet/Rocket M", ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_m_setup);
/* TODO detect the second ethernet port and use one
init function for all Ubiquiti MIMO series products */
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index 9b6747210..4cc97632a 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -83,8 +83,11 @@ static struct board_rec boards[] __initdata = {
.name = "UBNT-LSX",
.mach_type = AR71XX_MACH_UBNT_LSX,
}, {
- .name = "UBNT-M",
- .mach_type = AR71XX_MACH_UBNT_M,
+ .name = "UBNT-BM",
+ .mach_type = AR71XX_MACH_UBNT_BULLET_M,
+ }, {
+ .name = "UBNT-RM",
+ .mach_type = AR71XX_MACH_UBNT_ROCKET_M,
}, {
.name = "UBNT-NM",
.mach_type = AR71XX_MACH_UBNT_NANO_M,
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index 8584562e9..a9f288b27 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -140,8 +140,9 @@ enum ar71xx_mach_type {
AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */
AR71XX_MACH_UBNT_RS, /* Ubiquiti RouterStation */
AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
- AR71XX_MACH_UBNT_M, /* Ubiquiti Bullet M */
- AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti Bullet M */
+ AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
+ AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
+ AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
AR71XX_MACH_WNR2000, /* NETGEAR WNR2000 */
AR71XX_MACH_WNDR3700, /* NETGEAR WNDR3700 */
AR71XX_MACH_WP543, /* Compex WP543 */