[ar71xx] preliminary support for the Atheros AP81 refrence board

[openwrt.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 5402e0a..810b474 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -19,7 +19,8 @@
 #include <asm/fw/myloader/myloader.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 struct board_rec {
        char            *name;
@@ -44,18 +45,33 @@ static struct board_rec boards[] __initdata = {
                .name           = "493",
                .mach_type      = AR71XX_MACH_RB_493,
        }, {
-               .name           = "AW-NR580",
-               .mach_type      = AR71XX_MACH_AW_NR580,
+               .name           = "AP81",
+               .mach_type      = AR71XX_MACH_AP81,
        }, {
                .name           = "AP83",
                .mach_type      = AR71XX_MACH_AP83,
        }, {
+               .name           = "AW-NR580",
+               .mach_type      = AR71XX_MACH_AW_NR580,
+       }, {
                .name           = "TEW-632BRP",
                .mach_type      = AR71XX_MACH_TEW_632BRP,
        }, {
+               .name           = "TL-WR941ND",
+               .mach_type      = AR71XX_MACH_TL_WR941ND,
+       }, {
                .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,
        }, {
@@ -115,10 +131,16 @@ static __init char *ar71xx_prom_getenv(const char *envname)
        if (!is_valid_ram_addr(ar71xx_prom_envp))
                return NULL;
 
-       for (env = ar71xx_prom_envp; is_valid_ram_addr(*env); env++)
+       for (env = ar71xx_prom_envp; is_valid_ram_addr(*env); env++) {
                if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=')
                        return *env + len + 1;
 
+               /* RedBoot env comes in pointer pairs - key, value */
+               if (strncmp(envname, *env, len) == 0 && (*env)[len] == 0)
+                       if (is_valid_ram_addr(*(++env)))
+                               return *env;
+       }
+
        return NULL;
 }
 
@@ -162,9 +184,9 @@ static void ar71xx_prom_init_generic(void)
        ar71xx_prom_argv = (char **)fw_arg1;
        ar71xx_prom_envp = (char **)fw_arg2;
 
-       p = ar71xx_prom_getenv("board");
+       p = ar71xx_prom_getargv("board");
        if (!p)
-               p = ar71xx_prom_getargv("board");
+               p = ar71xx_prom_getenv("board");
        if (p)
                ar71xx_mach_type = find_board_byname(p);