1 --- a/arch/mips/ath79/prom.c
2 +++ b/arch/mips/ath79/prom.c
3 @@ -33,6 +33,41 @@ static void __init ath79_prom_append_cmd
4 strlcat(arcs_cmdline, ath79_cmdline_buf, sizeof(arcs_cmdline));
7 +#ifdef CONFIG_IMAGE_CMDLINE_HACK
8 +extern char __image_cmdline[];
10 +static int __init ath79_use_image_cmdline(void)
12 + char *p = __image_cmdline;
24 + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
26 + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
27 + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
30 + /* Validate and setup environment pointer */
31 + if (fw_arg2 < CKSEG0)
34 + _fw_envp = (int *)fw_arg2;
39 +static inline int ath79_use_image_cmdline(void) { return 0; }
42 static int __init ath79_prom_init_myloader(void)
44 struct myloader_info *mylo;
45 @@ -61,6 +96,8 @@ static int __init ath79_prom_init_myload
47 ath79_prom_append_cmdline("ethaddr", mac_buf);
49 + ath79_use_image_cmdline();
54 @@ -71,7 +108,8 @@ void __init prom_init(void)
55 if (ath79_prom_init_myloader())
59 + if (!ath79_use_image_cmdline())
62 env = fw_getenv("ethaddr");
64 --- a/arch/mips/fw/lib/cmdline.c
65 +++ b/arch/mips/fw/lib/cmdline.c
66 @@ -35,6 +35,7 @@ void __init fw_init_cmdline(void)
68 _fw_envp = (int *)fw_arg2;
70 + arcs_cmdline[0] = '\0';
71 for (i = 1; i < fw_argc; i++) {
72 strlcat(arcs_cmdline, fw_argv(i), COMMAND_LINE_SIZE);
73 if (i < (fw_argc - 1))