MIPS: TXx9: Early command-line preprocessing

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / generic / setup.c

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index fe6bee09cecea23e640a40861a9dcbc4e4adfe94..dc5dbcc53a913c449e09bd5f8e65d963bdea794a 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -119,39 +119,114 @@ int irq_to_gpio(unsigned irq)
 EXPORT_SYMBOL(irq_to_gpio);
 #endif
 
-extern struct txx9_board_vec jmr3927_vec;
-extern struct txx9_board_vec rbtx4927_vec;
-extern struct txx9_board_vec rbtx4937_vec;
-extern struct txx9_board_vec rbtx4938_vec;
+#define BOARD_VEC(board)       extern struct txx9_board_vec board;
+#include <asm/txx9/boards.h>
+#undef BOARD_VEC
 
 struct txx9_board_vec *txx9_board_vec __initdata;
 static char txx9_system_type[32];
 
-void __init prom_init_cmdline(void)
+static struct txx9_board_vec *board_vecs[] __initdata = {
+#define BOARD_VEC(board)       &board,
+#include <asm/txx9/boards.h>
+#undef BOARD_VEC
+};
+
+static struct txx9_board_vec *__init find_board_byname(const char *name)
+{
+       int i;
+
+       /* search board_vecs table */
+       for (i = 0; i < ARRAY_SIZE(board_vecs); i++) {
+               if (strstr(board_vecs[i]->system, name))
+                       return board_vecs[i];
+       }
+       return NULL;
+}
+
+static void __init prom_init_cmdline(void)
 {
        int argc = (int)fw_arg0;
-       char **argv = (char **)fw_arg1;
+       int *argv32 = (int *)fw_arg1;
        int i;                  /* Always ignore the "-c" at argv[0] */
-#ifdef CONFIG_64BIT
-       char *fixed_argv[32];
-       for (i = 0; i < argc; i++)
-               fixed_argv[i] = (char *)(long)(*((__s32 *)argv + i));
-       argv = fixed_argv;
-#endif
+       char builtin[CL_SIZE];
 
        /* ignore all built-in args if any f/w args given */
-       if (argc > 1)
-               *arcs_cmdline = '\0';
+       /*
+        * But if built-in strings was started with '+', append them
+        * to command line args.  If built-in was started with '-',
+        * ignore all f/w args.
+        */
+       builtin[0] = '\0';
+       if (arcs_cmdline[0] == '+')
+               strcpy(builtin, arcs_cmdline + 1);
+       else if (arcs_cmdline[0] == '-') {
+               strcpy(builtin, arcs_cmdline + 1);
+               argc = 0;
+       } else if (argc <= 1)
+               strcpy(builtin, arcs_cmdline);
+       arcs_cmdline[0] = '\0';
 
        for (i = 1; i < argc; i++) {
+               char *str = (char *)(long)argv32[i];
                if (i != 1)
                        strcat(arcs_cmdline, " ");
-               strcat(arcs_cmdline, argv[i]);
+               if (strchr(str, ' ')) {
+                       strcat(arcs_cmdline, "\"");
+                       strcat(arcs_cmdline, str);
+                       strcat(arcs_cmdline, "\"");
+               } else
+                       strcat(arcs_cmdline, str);
+       }
+       /* append saved builtin args */
+       if (builtin[0]) {
+               if (arcs_cmdline[0])
+                       strcat(arcs_cmdline, " ");
+               strcat(arcs_cmdline, builtin);
        }
 }
 
-void __init prom_init(void)
+static void __init preprocess_cmdline(void)
+{
+       char cmdline[CL_SIZE];
+       char *s;
+
+       strcpy(cmdline, arcs_cmdline);
+       s = cmdline;
+       arcs_cmdline[0] = '\0';
+       while (s && *s) {
+               char *str = strsep(&s, " ");
+               if (strncmp(str, "board=", 6) == 0) {
+                       txx9_board_vec = find_board_byname(str + 6);
+                       continue;
+               } else if (strncmp(str, "masterclk=", 10) == 0) {
+                       unsigned long val;
+                       if (strict_strtoul(str + 10, 10, &val) == 0)
+                               txx9_master_clock = val;
+                       continue;
+               }
+               if (arcs_cmdline[0])
+                       strcat(arcs_cmdline, " ");
+               strcat(arcs_cmdline, str);
+       }
+}
+
+static void __init select_board(void)
 {
+       const char *envstr;
+
+       /* first, determine by "board=" argument in preprocess_cmdline() */
+       if (txx9_board_vec)
+               return;
+       /* next, determine by "board" envvar */
+       envstr = prom_getenv("board");
+       if (envstr) {
+               txx9_board_vec = find_board_byname(envstr);
+               if (txx9_board_vec)
+                       return;
+       }
+
+       /* select "default" board */
 #ifdef CONFIG_CPU_TX39XX
        txx9_board_vec = &jmr3927_vec;
 #endif
@@ -172,6 +247,13 @@ void __init prom_init(void)
 #endif
        }
 #endif
+}
+
+void __init prom_init(void)
+{
+       prom_init_cmdline();
+       preprocess_cmdline();
+       select_board();
 
        strcpy(txx9_system_type, txx9_board_vec->system);
 
@@ -192,6 +274,21 @@ char * __init prom_getcmdline(void)
        return &(arcs_cmdline[0]);
 }
 
+const char *__init prom_getenv(const char *name)
+{
+       const s32 *str = (const s32 *)fw_arg2;
+
+       if (!str)
+               return NULL;
+       /* YAMON style ("name", "value" pairs) */
+       while (str[0] && str[1]) {
+               if (!strcmp((const char *)(unsigned long)str[0], name))
+                       return (const char *)(unsigned long)str[1];
+               str += 2;
+       }
+       return NULL;
+}
+
 static void __noreturn txx9_machine_halt(void)
 {
        local_irq_disable();