target/linux/ar71xx/patches-4.4/508-MIPS-ath79-prom-image-command-line-hack.patch

   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));
   5  }
   6
   7 +#ifdef CONFIG_IMAGE_CMDLINE_HACK
   8 +extern char __image_cmdline[];
   9 +
  10 +static int __init ath79_use_image_cmdline(void)
  11 +{
  12 +       char *p = __image_cmdline;
  13 +       int replace = 0;
  14 +
  15 +       if (*p == '-') {
  16 +               replace = 1;
  17 +               p++;
  18 +       }
  19 +
  20 +       if (*p == '\0')
  21 +               return 0;
  22 +
  23 +       if (replace) {
  24 +               strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
  25 +       } else {
  26 +               strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
  27 +               strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
  28 +       }
  29 +
  30 +       /* Validate and setup environment pointer */
  31 +       if (fw_arg2 < CKSEG0)
  32 +               _fw_envp = NULL;
  33 +       else
  34 +               _fw_envp = (int *)fw_arg2;
  35 +
  36 +       return 1;
  37 +}
  38 +#else
  39 +static inline int ath79_use_image_cmdline(void) { return 0; }
  40 +#endif
  41 +
  42  static int __init ath79_prom_init_myloader(void)
  43  {
  44         struct myloader_info *mylo;
  45 @@ -61,6 +96,8 @@ static int __init ath79_prom_init_myload
  46
  47         ath79_prom_append_cmdline("ethaddr", mac_buf);
  48
  49 +       ath79_use_image_cmdline();
  50 +
  51         return 1;
  52  }
  53
  54 @@ -71,7 +108,8 @@ void __init prom_init(void)
  55         if (ath79_prom_init_myloader())
  56                 return;
  57
  58 -       fw_init_cmdline();
  59 +       if (!ath79_use_image_cmdline())
  60 +               fw_init_cmdline();
  61
  62         env = fw_getenv("ethaddr");
  63         if (env)
  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)
  67         else
  68                 _fw_envp = (int *)fw_arg2;
  69
  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))