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

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