ar71xx: build ALFA AP96 images with default profile as well

[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 2accbf8f209ff534a0fbf240ecf21d6d5074eba3..b9b1e64fdf63ca56888d3eda669b69267aa77e58 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -33,13 +33,13 @@ 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 const char * __init ar71xx_prom_find_env(char **envp, const char *name)
@@ -69,11 +69,40 @@ static const char * __init ar71xx_prom_find_env(char **envp, const char *name)
        return ret;
 }
 
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+extern char __image_cmdline[];
+
+static int __init ar71xx_use__image_cmdline(void)
+{
+       char *p = __image_cmdline;
+       int replace = 0;
+
+       if (*p == '-') {
+               replace = 1;
+               p++;
+       }
+
+       if (*p == '\0')
+               return 0;
+
+       if (replace) {
+               strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
+       } else {
+               strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+               strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
+       }
+
+       return 1;
+}
+#else
+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];
-       char *mac;
+       unsigned char *mac;
 
        mylo = myloader_get_info();
        if (!mylo)
@@ -95,37 +124,10 @@ static int __init ar71xx_prom_init_myloader(void)
 
        ar71xx_prom_append_cmdline("ethaddr", mac_buf);
 
-       return 1;
-}
-
-#ifdef CONFIG_IMAGE_CMDLINE_HACK
-extern char __image_cmdline[];
-
-static int __init ar71xx_use__image_cmdline(void)
-{
-       char *p = __image_cmdline;
-       int replace = 0;
-
-       if (*p == '-') {
-               replace = 1;
-               p++;
-       }
-
-       if (*p == '\0')
-               return 0;
-
-       if (replace) {
-               strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
-       } else {
-               strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-               strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
-       }
+       ar71xx_use__image_cmdline();
 
        return 1;
 }
-#else
-static int inline ar71xx_use__image_cmdline(void) { return 0; }
-#endif
 
 static __init void ar71xx_prom_init_cmdline(int argc, char **argv)
 {