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

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