[Gc-linux-cvs] linux/arch/powerpc/platforms/embedded6xx Kconfig, 1.1, 1.2 Makefile, 1.2, 1.3

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15088/arch/powerpc/platforms/embedded6xx

Modified Files:
	Kconfig Makefile 
Log Message:
Use CONFIG_GAMECUBE_COMMON to denote common code between gamecube and wii.
Use CONFIG_GAMECUBE for the gamecube platform.
Use CONFIG_WII for the wii platform.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	18 Mar 2008 18:57:16 -0000	1.2
+++ Makefile	26 Mar 2008 20:02:27 -0000	1.3
@@ -5,7 +5,9 @@
 obj-$(CONFIG_LINKSTATION)	+= linkstation.o ls_uart.o
 obj-$(CONFIG_PPC_HOLLY)		+= holly.o
 obj-$(CONFIG_PPC_PRPMC2800)	+= prpmc2800.o
-obj-$(CONFIG_GAMECUBE)		+= gamecube.o
-obj-$(CONFIG_GAMECUBE_WII)	+= starlet-ipc.o starlet-stm.o
-obj-$(CONFIG_GAMECUBE_RESET)	+= gcn-rsw.o
-obj-$(CONFIG_USBGECKO_EARLY_CONSOLE)	+= ugecon.o
+obj-$(CONFIG_FLIPPER_PIC)	+= flipper-pic.o
+obj-$(CONFIG_GAMECUBE)		+= gamecube.o gamecube_dev.o
+obj-$(CONFIG_WII)		+= wii.o wii_dev.o \
+					starlet-ipc.o starlet-stm.o
+obj-$(CONFIG_GAMECUBE_RSW)	+= gcn-rsw.o
+obj-$(CONFIG_USBGECKO_UDBG)	+= usbgecko_udbg.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kconfig	4 Mar 2008 06:20:55 -0000	1.1
+++ Kconfig	26 Mar 2008 20:02:27 -0000	1.2
@@ -49,17 +49,19 @@
 config GAMECUBE
 	bool "Nintendo-GameCube"
 	depends on EMBEDDED6xx
-	select NOT_COHERENT_CACHE
+	select GAMECUBE_COMMON
 	select WANT_DEVICE_TREE
 	help
 	 Select GAMECUBE if configuring for the Nintendo GameCube.
 	 More information at: <http://gc-linux.sourceforge.net/>
 
-config GAMECUBE_WII
+config WII
 	bool "Nintendo-Wii"
-	depends on GAMECUBE
+	depends on EMBEDDED6xx
+	select GAMECUBE_COMMON
+	select WANT_DEVICE_TREE
 	help
-	 Select GAMECUBE_WII if configuring for the Nintendo Wii.
+	 Select WII if configuring for the Nintendo Wii.
 	 More information at: <http://gc-linux.sourceforge.net/>
 
 config TSI108_BRIDGE
@@ -91,23 +93,37 @@
 	bool "Enable MPC10x store gathering"
 	depends on MPC10X_BRIDGE
 
-config GAMECUBE_RESET
-	bool "Nintendo GameCube reset button"
-	depends on GAMECUBE
+config FLIPPER_PIC
+	bool
+	default n
+
+config GAMECUBE_COMMON
+	bool
+	select FLIPPER_PIC
+	select NOT_COHERENT_CACHE
+	default n
+	
+config GAMECUBE_RSW
+	bool "Nintendo GameCube/Wii reset switch/button"
+	depends on GAMECUBE_COMMON
 	default y
 	help
 	  If you say yes to this option, support will be included for the
-	  reset button of the Nintendo GameCube.
+	  reset switch/button of the Nintendo GameCube/Wii.
 	  
 	  If in doubt, say Y here.
 
-config USBGECKO_EARLY_CONSOLE
-	bool "Enable USB Gecko early console"
-	depends on GAMECUBE
+config USBGECKO_UDBG
+	bool "USB Gecko udbg console for the Nintendo GameCube/Wii"
+	depends on GAMECUBE_COMMON
 	default n
 	help
-	  If you say yes to this option, support will be included for
-	  the USB Gecko adapter as an early console.
+	  If you say yes to this option, support will be included for the
+	  USB Gecko adapter as an udbg console.
+	  The USB Gecko is an USB serial-to-spi converter that can be plugged
+	  into a memcard slot in the Nintendo GameCube/Wii.
+	  
+	  This driver bypasses the EXI layer completely.
 	  
 	  If in doubt, say N here.