ar71xx: build ALFA AP96 images with default profile as well

[oweals/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 87d6da0067e641b76609af1fded3a01c9b57ec15..b9b1e64fdf63ca56888d3eda669b69267aa77e58 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx SoC specific prom routines
  *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -33,65 +33,40 @@ static inline int is_valid_ram_addr(void *addr)
        return 0;
 }
 
+static char ar71xx_cmdline_buf[COMMAND_LINE_SIZE] __initdata;
 static void __init ar71xx_prom_append_cmdline(const char *name,
                                              const char *value)
 {
-       char buf[COMMAND_LINE_SIZE];
-
-       snprintf(buf, sizeof(buf), " %s=%s", name, value);
-       strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline));
+       snprintf(ar71xx_cmdline_buf, sizeof(ar71xx_cmdline_buf),
+                " %s=%s", name, value);
+       strlcat(arcs_cmdline, ar71xx_cmdline_buf, sizeof(arcs_cmdline));
 }
 
-static void __init ar71xx_prom_find_env(char **envp, const char *name)
+static const char * __init ar71xx_prom_find_env(char **envp, const char *name)
 {
-       int len = strlen(name);
+       const char *ret = NULL;
+       int len;
        char **p;
 
        if (!is_valid_ram_addr(envp))
-               return;
+               return NULL;
 
+       len = strlen(name);
        for (p = envp; is_valid_ram_addr(*p); p++) {
                if (strncmp(name, *p, len) == 0 && (*p)[len] == '=') {
-                       ar71xx_prom_append_cmdline(name, *p + len + 1);
+                       ret = *p + len + 1;
                        break;
                }
 
                /* RedBoot env comes in pointer pairs - key, value */
                if (strncmp(name, *p, len) == 0 && (*p)[len] == 0)
                        if (is_valid_ram_addr(*(++p))) {
-                               ar71xx_prom_append_cmdline(name, *p);
+                               ret = *p;
                                break;
                        }
        }
-}
-
-static int __init ar71xx_prom_init_myloader(void)
-{
-       struct myloader_info *mylo;
-       char mac_buf[32];
-       char *mac;
-
-       mylo = myloader_get_info();
-       if (!mylo)
-               return 0;
-
-       switch (mylo->did) {
-       case DEVID_COMPEX_WP543:
-               ar71xx_prom_append_cmdline("board", "WP543");
-               break;
-       default:
-               printk(KERN_WARNING "prom: unknown device id: %x\n",
-                               mylo->did);
-               return 0;
-       }
-
-       mac = mylo->macs[0];
-       snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
-                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-
-       ar71xx_prom_append_cmdline("ethaddr", mac_buf);
 
-       return 1;
+       return ret;
 }
 
 #ifdef CONFIG_IMAGE_CMDLINE_HACK
@@ -120,9 +95,40 @@ static int __init ar71xx_use__image_cmdline(void)
        return 1;
 }
 #else
-static int inline ar71xx_use__image_cmdline(void) { return 0; }
+static inline int ar71xx_use__image_cmdline(void) { return 0; }
 #endif
 
+static int __init ar71xx_prom_init_myloader(void)
+{
+       struct myloader_info *mylo;
+       char mac_buf[32];
+       unsigned char *mac;
+
+       mylo = myloader_get_info();
+       if (!mylo)
+               return 0;
+
+       switch (mylo->did) {
+       case DEVID_COMPEX_WP543:
+               ar71xx_prom_append_cmdline("board", "WP543");
+               break;
+       default:
+               printk(KERN_WARNING "prom: unknown device id: %x\n",
+                               mylo->did);
+               return 0;
+       }
+
+       mac = mylo->macs[0];
+       snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
+                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+       ar71xx_prom_append_cmdline("ethaddr", mac_buf);
+
+       ar71xx_use__image_cmdline();
+
+       return 1;
+}
+
 static __init void ar71xx_prom_init_cmdline(int argc, char **argv)
 {
        int i;
@@ -142,6 +148,7 @@ static __init void ar71xx_prom_init_cmdline(int argc, char **argv)
 
 void __init prom_init(void)
 {
+       const char *env;
        char **envp;
 
        printk(KERN_DEBUG "prom: fw_arg0=%08x, fw_arg1=%08x, "
@@ -156,8 +163,26 @@ void __init prom_init(void)
        ar71xx_prom_init_cmdline(fw_arg0, (char **)fw_arg1);
 
        envp = (char **)fw_arg2;
-       ar71xx_prom_find_env(envp, "board");
-       ar71xx_prom_find_env(envp, "ethaddr");
+       if (!strstr(arcs_cmdline, "ethaddr=")) {
+               env = ar71xx_prom_find_env(envp, "ethaddr");
+               if (env)
+                       ar71xx_prom_append_cmdline("ethaddr", env);
+       }
+
+       if (!strstr(arcs_cmdline, "board=")) {
+               env = ar71xx_prom_find_env(envp, "board");
+               if (env) {
+                       /* Workaround for buggy bootloaders */
+                       if (strcmp(env, "RouterStation") == 0 ||
+                           strcmp(env, "Ubiquiti AR71xx-based board") == 0)
+                               env = "UBNT-RS";
+
+                       if (strcmp(env, "RouterStation PRO") == 0)
+                               env = "UBNT-RSPRO";
+
+                       ar71xx_prom_append_cmdline("board", env);
+               }
+       }
 }
 
 void __init prom_free_prom_memory(void)