1 --- a/arch/mips/ath79/prom.c
2 +++ b/arch/mips/ath79/prom.c
3 @@ -33,6 +33,35 @@ 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));
33 +static inline int ath79_use_image_cmdline(void) { return 0; }
36 static int __init ath79_prom_init_myloader(void)
38 struct myloader_info *mylo;
39 @@ -61,6 +90,8 @@ static int __init ath79_prom_init_myload
41 ath79_prom_append_cmdline("ethaddr", mac_buf);
43 + ath79_use_image_cmdline();
48 @@ -71,7 +102,8 @@ void __init prom_init(void)
49 if (ath79_prom_init_myloader())
53 + if (!ath79_use_image_cmdline())
56 env = fw_getenv("ethaddr");