patches/2.6.20/88-dsmg600-dflt-cmdline.patch

   1 --- linux-2.6.19/arch/arm/mach-ixp4xx/dsmg600-setup.c~  2006-12-23 22:24:50.000000000 -0600
   2 +++ linux-2.6.19/arch/arm/mach-ixp4xx/dsmg600-setup.c   2006-12-25 23:23:40.000000000 -0600
   3 @@ -159,6 +159,9 @@
   4  }
   5
   6  static char dsmg600_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 ";
   7 +static char dsmg600_default_cmdline[] __initdata =
   8 +       "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw "
   9 +       CONFIG_CMDLINE;
  10
  11  static void __init dsmg600_fixup(struct machine_desc *desc,
  12                 struct tag *tags, char **cmdline, struct meminfo *mi)
  13 @@ -166,6 +169,11 @@
  14         struct tag *t = tags;
  15         char *p = *cmdline;
  16
  17 +       /* A command line in the ATAG list will override this one,
  18 +        * as is intended.
  19 +        */
  20 +       strlcpy(*cmdline, dsmg600_default_cmdline, COMMAND_LINE_SIZE);
  21 +
  22         /* Find the end of the tags table, taking note of any cmdline tag. */
  23         for (; t->hdr.size; t = tag_next(t)) {
  24                 if (t->hdr.tag == ATAG_CMDLINE) {