From: Albert H. <he...@us...> - 2009-10-25 18:59:38
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc Modified Files: Kconfig Kconfig.debug Log Message: Merge gc-linux-v2.6.31. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig 25 Oct 2009 18:56:55 -0000 1.12 --- Kconfig 25 Oct 2009 18:59:27 -0000 1.13 *************** *** 670,674 **** bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx --- 670,674 ---- bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx Index: Kconfig.debug =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig.debug 25 Oct 2009 18:56:55 -0000 1.11 --- Kconfig.debug 25 Oct 2009 18:59:27 -0000 1.12 *************** *** 255,258 **** --- 255,266 ---- has run, and set up the CPM in a particular way. + config PPC_EARLY_DEBUG_USBGECKO + bool "Early debugging through the USB Gecko adapter" + depends on GAMECUBE_COMMON + select USBGECKO_UDBG + help + Select this to enable early debugging for Nintendo GameCube/Wii + consoles via an external USB Gecko adapter. + endchoice |