ar71xx: update mips multi-machine stuff

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / prom.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index f522d1ff39dab24b0c989407a0a0572d3ba0fdce..5b47d6bfe2ab4c146e51e378f7ac418d64891099 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -20,148 +20,6 @@
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
-#include "machtype.h"
-#include "devices.h"
-
-struct board_rec {
-       char                    *name;
-       enum ar71xx_mach_type   mach_type;
-};
-
-static struct board_rec boards[] __initdata = {
-       {
-               .name           = "411",
-               .mach_type      = AR71XX_MACH_RB_411,
-       }, {
-               .name           = "411U",
-               .mach_type      = AR71XX_MACH_RB_411U,
-       }, {
-               .name           = "433",
-               .mach_type      = AR71XX_MACH_RB_433,
-       }, {
-               .name           = "433U",
-               .mach_type      = AR71XX_MACH_RB_433U,
-       }, {
-               .name           = "450",
-               .mach_type      = AR71XX_MACH_RB_450,
-       }, {
-               .name           = "450G",
-               .mach_type      = AR71XX_MACH_RB_450G,
-       }, {
-               .name           = "493",
-               .mach_type      = AR71XX_MACH_RB_493,
-       }, {
-               .name           = "AP81",
-               .mach_type      = AR71XX_MACH_AP81,
-       }, {
-               .name           = "AP83",
-               .mach_type      = AR71XX_MACH_AP83,
-       }, {
-               .name           = "AW-NR580",
-               .mach_type      = AR71XX_MACH_AW_NR580,
-       }, {
-               .name           = "DIR-825-B1",
-               .mach_type      = AR71XX_MACH_DIR_825_B1,
-       }, {
-               .name           = "TEW-632BRP",
-               .mach_type      = AR71XX_MACH_TEW_632BRP,
-       }, {
-               .name           = "DIR-615-C1",
-               .mach_type      = AR71XX_MACH_DIR_615_C1,
-       }, {
-               .name           = "TL-WR741ND",
-               .mach_type      = AR71XX_MACH_TL_WR741ND,
-       }, {
-               .name           = "TL-WR841N-v1.5",
-               .mach_type      = AR71XX_MACH_TL_WR841N_V1,
-       }, {
-               .name           = "TL-WR941ND",
-               .mach_type      = AR71XX_MACH_TL_WR941ND,
-       }, {
-               .name           = "TL-WR1043ND",
-               .mach_type      = AR71XX_MACH_TL_WR1043ND,
-       }, {
-               .name           = "UBNT-RS",
-               .mach_type      = AR71XX_MACH_UBNT_RS,
-       }, {
-               .name           = "UBNT-RSPRO",
-               .mach_type      = AR71XX_MACH_UBNT_RSPRO,
-       }, {
-               .name           = "Ubiquiti AR71xx-based board",
-               .mach_type      = AR71XX_MACH_UBNT_RS,
-       }, {
-               .name           = "UBNT-LS-SR71",
-               .mach_type      = AR71XX_MACH_UBNT_LSSR71,
-       }, {
-               .name           = "UBNT-LSX",
-               .mach_type      = AR71XX_MACH_UBNT_LSX,
-       }, {
-               .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,
-       }, {
-               .name           = "WNDR3700",
-               .mach_type      = AR71XX_MACH_WNDR3700,
-       }, {
-               .name           = "WNR2000",
-               .mach_type      = AR71XX_MACH_WNR2000,
-       }, {
-               .name           = "WRT160NL",
-               .mach_type      = AR71XX_MACH_WRT160NL,
-       }, {
-               .name           = "WP543",
-               .mach_type      = AR71XX_MACH_WP543,
-       }, {
-               .name           = "WRT400N",
-               .mach_type      = AR71XX_MACH_WRT400N,
-       }, {
-               .name           = "PB42",
-               .mach_type      = AR71XX_MACH_PB42,
-       }, {
-               .name           = "PB44",
-               .mach_type      = AR71XX_MACH_PB44,
-       }, {
-               .name           = "MZK-W300NH",
-               .mach_type      = AR71XX_MACH_MZK_W300NH,
-       }, {
-               .name           = "MZK-W04NU",
-               .mach_type      = AR71XX_MACH_MZK_W04NU,
-       }
-};
-
-static int __init ar71xx_board_setup(char *name)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(boards); i++)
-               if (strcmp(name, boards[i].name) == 0) {
-                       ar71xx_mach = boards[i].mach_type;
-                       break;
-               }
-
-       return 1;
-}
-__setup("board=", ar71xx_board_setup);
-
-static int __init ar71xx_ethaddr_setup(char *str)
-{
-       ar71xx_parse_mac_addr(str);
-       return 1;
-}
-__setup("ethaddr=", ar71xx_ethaddr_setup);
-
-static int __init ar71xx_kmac_setup(char *str)
-{
-       ar71xx_parse_mac_addr(str);
-       return 1;
-}
-__setup("kmac=", ar71xx_kmac_setup);
-
 static inline int is_valid_ram_addr(void *addr)
 {
        if (((u32) addr > KSEG0) &&
@@ -292,8 +150,6 @@ void __init prom_init(void)
                        (unsigned int)fw_arg2, (unsigned int)fw_arg3);
 
 
-       ar71xx_mach = AR71XX_MACH_GENERIC;
-
        if (ar71xx_prom_init_myloader())
                return;