Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5365313 authored by Adrian Bunk's avatar Adrian Bunk Committed by Paul Mackerras
Browse files

[POWERPC] Remove the broken Gemini support 



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cfcd1705

arch/powerpc/kernel/head_32.S

+0 −5
Original line number Diff line number Diff line
@@ -344,12 +344,7 @@ i##n: \ 
/* System reset */

/* core99 pmac starts the seconary here by changing the vector, and

   putting it back to what it was (unknown_exception) when done.  */

#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)

	. = 0x100

	b	__secondary_start_gemini

#else

	EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)

#endif



/* Machine check */

/*

arch/powerpc/platforms/embedded6xx/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -104,15 +104,6 @@ config RADSTONE_PPC7D 
config PAL4

	bool "SBS-Palomar4"



config GEMINI

	bool "Synergy-Gemini"

	select PPC_INDIRECT_PCI

	depends on BROKEN

	help

	  Select Gemini if configuring for a Synergy Microsystems' Gemini

	  series Single Board Computer.  More information is available at:

	  <http://www.synergymicro.com/PressRel/97_10_15.html>.



config EST8260

	bool "EST8260"

	---help---

arch/ppc/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -670,15 +670,6 @@ config RADSTONE_PPC7D 
config PAL4

	bool "SBS-Palomar4"



config GEMINI

	bool "Synergy-Gemini"

	depends on BROKEN

	select PPC_INDIRECT_PCI

	help

	  Select Gemini if configuring for a Synergy Microsystems' Gemini

	  series Single Board Computer.  More information is available at:

	  <http://www.synergymicro.com/PressRel/97_10_15.html>.



config EST8260

	bool "EST8260"

	---help---

arch/ppc/boot/simple/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -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)

arch/ppc/boot/simple/misc.c

+1 −14
Original line number Diff line number Diff line
@@ -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: ");