target/linux/generic/patches-3.18/997-device_tree_cmdline.patch

   1 --- a/drivers/of/fdt.c
   2 +++ b/drivers/of/fdt.c
   3 @@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
   4         p = of_get_flat_dt_prop(node, "bootargs", &l);
   5         if (p != NULL && l > 0)
   6                 strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
   7 +       p = of_get_flat_dt_prop(node, "bootargs-append", &l);
   8 +       if (p != NULL && l > 0)
   9 +               strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
  10
  11         /*
  12          * CONFIG_CMDLINE is meant to be a default in case nothing else
  13 --- a/arch/mips/kernel/prom.c
  14 +++ b/arch/mips/kernel/prom.c
  15 @@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
  16
  17  void __init __dt_setup_arch(void *bph)
  18  {
  19 +       if (boot_command_line[0] == '\0')
  20 +               strcpy(boot_command_line, arcs_cmdline);
  21 +
  22         if (!early_init_dt_scan(bph))
  23                 return;
  24