2 files changed, 1 insertions, 18 deletions

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 28be01b99c44..bcfb6cde70c4 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -116,10 +116,6 @@ zimageinitrd-$(CONFIG_WALNUT)		:= zImage.initrd-TREE
      extra.o-$(CONFIG_CHESTNUT)         := misc-chestnut.o
          end-$(CONFIG_CHESTNUT)         := chestnut
 
-      zimage-$(CONFIG_GEMINI)           := zImage-STRIPELF
-zimageinitrd-$(CONFIG_GEMINI)           := zImage.initrd-STRIPELF
-         end-$(CONFIG_GEMINI)           := gemini
-
      extra.o-$(CONFIG_KATANA)           := misc-katana.o
          end-$(CONFIG_KATANA)           := katana
    cacheflag-$(CONFIG_KATANA)           := -include $(clear_L2_L3)
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
index a5df08963695..c3d3305eb5ca 100644
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
@@ -42,14 +42,11 @@
 #endif
 
 /* Will / Can the user give input?
- * Val Henson has requested that Gemini doesn't wait for the
- * user to edit the cmdline or not.
  */
 #if (defined(CONFIG_SERIAL_8250_CONSOLE) \
         || defined(CONFIG_VGA_CONSOLE) \
         || defined(CONFIG_SERIAL_MPC52xx_CONSOLE) \
-        || defined(CONFIG_SERIAL_MPSC_CONSOLE)) \
-        && !defined(CONFIG_GEMINI)
+        || defined(CONFIG_SERIAL_MPSC_CONSOLE))
 #define INTERACTIVE_CONSOLE     1
 #endif
 
@@ -178,16 +175,6 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
 
         if (keyb_present)
                 CRT_tstc();  /* Forces keyboard to be initialized */
-#ifdef CONFIG_GEMINI
-        /*
-         * If cmd_line is empty and cmd_preset is not, copy cmd_preset
-         * to cmd_line.  This way we can override cmd_preset with the
-         * command line from Smon.
-         */
-
-        if ( (cmd_line[0] == '\0') && (cmd_preset[0] != '\0'))
-                memcpy (cmd_line, cmd_preset, sizeof(cmd_preset));
-#endif
 
         /* Display standard Linux/PPC boot prompt for kernel args */
         puts("\nLinux/PPC load: ");