- char *p;
-
- ar71xx_prom_argc = fw_arg0;
- ar71xx_prom_argv = (char **)fw_arg1;
- ar71xx_prom_envp = (char **)fw_arg2;
-
- p = ar71xx_prom_getargv("board");
- if (!p)
- p = ar71xx_prom_getenv("board");
- if (p)
- ar71xx_mach = find_board_byname(p);
-
- p = ar71xx_prom_getenv("ethaddr");
- if (!p)
- p = ar71xx_prom_getargv("kmac");
- if (p)
- ar71xx_parse_mac_addr(p);
+ 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 int inline ar71xx_use__image_cmdline(void) { return 0; }
+#endif
+
+static __init void ar71xx_prom_init_cmdline(int argc, char **argv)
+{
+ int i;
+
+ if (ar71xx_use__image_cmdline())
+ return;
+
+ if (!is_valid_ram_addr(argv))
+ return;
+
+ for (i = 0; i < argc; i++)
+ if (is_valid_ram_addr(argv[i])) {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, argv[i], sizeof(arcs_cmdline));
+ }