[Gc-linux-cvs] linux/arch/powerpc/platforms/embedded6xx Kconfig, 1.11, 1.12 Makefile, 1.11, 1.12

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/platforms/embedded6xx

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:53:45 -0000	1.11
--- Makefile	25 Oct 2009 18:59:27 -0000	1.12
***************
*** 8,9 ****
--- 8,20 ----
  obj-$(CONFIG_PPC_PRPMC2800)	+= prpmc2800.o
  obj-$(CONFIG_PPC_C2K)		+= c2k.o
+ obj-$(CONFIG_GAMECUBE)		+= gamecube.o gamecube_dev.o
+ obj-$(CONFIG_WII)		+= wii.o wii_dev.o
+ obj-$(CONFIG_WII_GPIO)		+= starlet-gpio.o
+ obj-$(CONFIG_STARLET_MINI)	+= starlet-mipc.o
+ obj-$(CONFIG_STARLET_IOS)	+= starlet-ipc.o starlet-malloc.o \
+ 					starlet-stm.o starlet-es.o
+ obj-$(CONFIG_FLIPPER_PIC)	+= flipper-pic.o
+ obj-$(CONFIG_HOLLYWOOD_PIC)	+= hollywood-pic.o
+ obj-$(CONFIG_USBGECKO_UDBG)	+= usbgecko_udbg.o
+ obj-$(CONFIG_GAMECUBE_VIDEO_UDBG)	+= gcnvi_udbg.o
+ obj-$(CONFIG_GAMECUBE_RSW)	+= gcn-rsw.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:27 -0000	1.12
***************
*** 91,92 ****
--- 91,198 ----
  	bool "Enable MPC10x store gathering"
  	depends on MPC10X_BRIDGE
+ 
+ config GAMECUBE
+ 	bool "Nintendo-GameCube"
+ 	depends on EMBEDDED6xx
+ 	select GAMECUBE_COMMON
+ 	help
+ 	  Select GAMECUBE if configuring for the Nintendo GameCube.
+ 	  More information at: <http://gc-linux.sourceforge.net/>
+ 
+ config WII
+ 	bool "Nintendo-Wii"
+ 	depends on EMBEDDED6xx
+ 	select GAMECUBE_COMMON
+ 	select PPC_LIB_RHEAP if STARLET_IOS
+ 	select USB_ARCH_HAS_EHCI if STARLET_MINI
+ 	select USB_ARCH_HAS_OHCI if STARLET_MINI
+ 	select HAVE_GENERIC_DMA_COHERENT
+ 	help
+ 	  Select WII if configuring for the Nintendo Wii.
+ 	  More information at: <http://gc-linux.sourceforge.net/>
+ 
+ config STARLET_IOS
+ 	bool "Nintendo Wii Starlet IOS support"
+ 	depends on WII
+ 	default y
+ 
+ config STARLET_MINI
+ 	bool "Team Twiizers 'mini' firmware support"
+ 	depends on WII && EXPERIMENTAL
+ 	default y
+ 
+ config FLIPPER_PIC
+ 	bool
+ 	depends on GAMECUBE_COMMON
+ 	default y
+ 
+ config HOLLYWOOD_PIC
+ 	bool
+ 	depends on STARLET_MINI
+ 	default y
+ 
+ config GAMECUBE_COMMON
+ 	bool
+ 	select NOT_COHERENT_CACHE
+ 	select FLIPPER_PIC
+ 	default n
+ 
+ config GAMECUBE_UDBG
+ 	bool "Nintendo GameCube/Wii udbg support"
+ 	depends on GAMECUBE_COMMON
+ 	default n
+ 	help
+ 	  If you say yes to this option, you will be able to choose between
+ 	  several udbg drivers available for the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say N here.
+ 
+ choice
+ 	prompt "Nintendo GameCube/Wii udbg drivers"
+ 	depends on GAMECUBE_UDBG
+ 
+ config USBGECKO_UDBG
+ 	bool "USB Gecko udbg console for the Nintendo GameCube/Wii"
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  USB Gecko adapter as an udbg console.
+ 	  The USB Gecko is a EXI to USB Serial 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.
+ 
+ config GAMECUBE_VIDEO_UDBG
+ 	bool "Nintendo GameCube/Wii framebuffer udbg console"
+ 	select FONTS
+ 	select FONT_8x16
+ 	help
+ 	  If you say yes to this option, support will be included for a
+ 	  framebuffer based udbg console for the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say N here.
+ 
+ endchoice
+ 
+ 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 switch/button of the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say Y here.
+ 
+ config WII_GPIO
+ 	bool "Nintendo Wii GPIO support"
+ 	depends on GPIOLIB
+ 	default y
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Nintendo Wii GPIO lines that control, for example, the sensor
+ 	  bar IR leds, the front led, or the eject switch of the disk unit.
+ 
+ 	  If in doubt, say Y here.
+