6 files changed, 11 insertions, 103 deletions
diff --git a/packages/arm-kernel-shim/files/cmdline_if_none.patch b/packages/arm-kernel-shim/files/cmdline_if_none.patch
deleted file mode 100644
index 460f7be090..0000000000
--- a/packages/arm-kernel-shim/files/cmdline_if_none.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- arm-kernel-shim-1.3/main.c.orig	2007-02-14 19:05:35.000000000 -0600
-+++ arm-kernel-shim-1.3/main.c	2007-02-14 22:48:06.000000000 -0600
-@@ -153,6 +153,42 @@
-   p->hdr.tag		= ATAG_NONE;
-   p->hdr.size		= 0;
- 
-+#else
-+
-+#ifdef CMDLINE_IF_NONE
-+
-+  /* Walk over the ATAG list, we need to find the end of the list.
-+   * If we find a command line tag, stash away the pointer to the
-+   * actual command line itself.  Note that the implementation
-+   * below assumes a single ATAG_CMDLINE passed in from the
-+   * bootloader, which may not be a good assumption in all cases.
-+   */
-+  {
-+    char *c = 0;
-+    for_each_tag(p, (struct tag*) PHYS_PARAMS)
-+      if (p->hdr.tag == ATAG_CMDLINE) c = p->u.cmdline.cmdline;
-+
-+  /* p -> final tag (ATAG_NONE), and c -> command line if found */
-+  /* if no ATAG_CMDLINE, or command line is empty, add the default one. */
-+
-+    if ((c == 0) || (*c == 0)) {
-+      p->hdr.tag = ATAG_CMDLINE;
-+      p->hdr.size = tag_size (tag_cmdline)
-+        + (sizeof (cmdline)+3)/4 - 1;
-+      {
-+        const char* sz = cmdline + offset;
-+        int i;
-+        for (i = 0; i < sizeof (cmdline); ++i)
-+          p->u.cmdline.cmdline[i] = sz[i];
-+      }
-+      p = tag_next (p);
-+      p->hdr.tag = ATAG_NONE;
-+      p->hdr.size = 0;
-+    }
-+  }
-+
-+#endif
-+
- #endif
- 
- 	/* Pass control to the kernel */
diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h
index 3203052d51..ebe53901b8 100644
--- a/packages/arm-kernel-shim/files/config-dsmg600.h
+++ b/packages/arm-kernel-shim/files/config-dsmg600.h
@@ -16,25 +16,11 @@
 
 #define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
-//#define RAM_BANK0_START	   0x00000000
-//#define RAM_BANK0_LENGTH   0x04000000
-
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-#define COMMANDLINE \
- "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
-
 #define MACH_TYPE		   964
 
-/* The DSM-G600 RedBoot sets up the ATAGs correctly */
-#define PASSTHROUGH_ATAGS
-
-/* but if the command line passed in is empty, use the default above. */
-#define CMDLINE_IF_NONE
+#define GUARANTEE_ATAG_CMDLINE
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h
index 08684d708e..fa894e89ac 100644
--- a/packages/arm-kernel-shim/files/config-fsg3.h
+++ b/packages/arm-kernel-shim/files/config-fsg3.h
@@ -19,16 +19,9 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-//#define COMMANDLINE\
-// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
-
 #define MACH_TYPE		   1091
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h
index 846161d016..99bc91fb7a 100644
--- a/packages/arm-kernel-shim/files/config-nas100d.h
+++ b/packages/arm-kernel-shim/files/config-nas100d.h
@@ -19,16 +19,13 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
+#define MACH_TYPE		   865
 
-#define COMMANDLINE\
- "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
+#define CREATE_ATAGS
 
-#define MACH_TYPE		   865
+#define GUARANTEE_ATAG_CMDLINE
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h
index d641523841..c751d84a44 100644
--- a/packages/arm-kernel-shim/files/config-nslu2.h
+++ b/packages/arm-kernel-shim/files/config-nslu2.h
@@ -19,16 +19,13 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x02000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
+#define MACH_TYPE		   597
 
-#define COMMANDLINE\
- "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
+#define CREATE_ATAGS
 
-#define MACH_TYPE		   597
+#define GUARANTEE_ATAG_CMDLINE
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/passthrough-atags.patch b/packages/arm-kernel-shim/files/passthrough-atags.patch
deleted file mode 100644
index 194279df89..0000000000
--- a/packages/arm-kernel-shim/files/passthrough-atags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arm-kernel-shim-1.3/main.c~	2007-02-11 05:52:32.000000000 +1030
-+++ arm-kernel-shim-1.3/main.c	2007-02-14 16:39:40.000000000 +1030
-@@ -100,6 +100,8 @@
- 		  :  "+r" (offset)
- 		  :: "lr", "cc");
- 
-+#if !defined (PASSTHROUGH_ATAGS)
-+
-   p = (struct tag*) PHYS_PARAMS;
- 
- 	/* Always start with the CORE tag */
-@@ -151,6 +153,8 @@
-   p->hdr.tag		= ATAG_NONE;
-   p->hdr.size		= 0;
- 
-+#endif
-+
- 	/* Pass control to the kernel */
-   boot (0, MACH_TYPE, PHYS_PARAMS);
- }