Menu
▾
▴
gc-linux-cvs — CVS commit logs.
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
(53) |
Feb
(78) |
Mar
(34) |
Apr
(26) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(16) |
Sep
(2) |
Oct
(58) |
Nov
(13) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(62) |
Feb
(4) |
Mar
(40) |
Apr
(9) |
May
(13) |
Jun
(26) |
Jul
(32) |
Aug
(24) |
Sep
(18) |
Oct
(18) |
Nov
(14) |
Dec
|
| 2006 |
Jan
(15) |
Feb
(2) |
Mar
(23) |
Apr
(2) |
May
(2) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(1) |
Feb
(45) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(31) |
Dec
(5) |
| 2008 |
Jan
(6) |
Feb
(34) |
Mar
(113) |
Apr
(40) |
May
(19) |
Jun
(5) |
Jul
(41) |
Aug
(13) |
Sep
(53) |
Oct
(4) |
Nov
(53) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(29) |
Mar
(66) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(163) |
Nov
|
Dec
(91) |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:41
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video/logo Modified Files: Kconfig Makefile logo.c Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:56:56 -0000 1.11 --- Makefile 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 8,11 **** --- 8,12 ---- obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o + obj-$(CONFIG_LOGO_GAMECUBE_CLUT224) += logo_gcn_clut224.o obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig 25 Oct 2009 18:53:46 -0000 1.11 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 43,46 **** --- 43,51 ---- default y + config LOGO_GAMECUBE_CLUT224 + bool "224-color GameCube Linux logo" + depends on GAMECUBE + default y + config LOGO_MAC_CLUT224 bool "224-color Macintosh Linux logo" Index: logo.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** logo.c 25 Oct 2009 18:56:56 -0000 1.11 --- logo.c 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 76,79 **** --- 76,83 ---- logo = &logo_dec_clut224; #endif + #ifdef CONFIG_LOGO_GAMECUBE_CLUT224 + /* GameCube Linux logo */ + logo = &logo_gcn_clut224; + #endif #ifdef CONFIG_LOGO_MAC_CLUT224 /* Macintosh Linux logo on m68k */ |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:40
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/boot Modified Files: Makefile wrapper Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 25 Oct 2009 18:53:45 -0000 1.12 --- Makefile 25 Oct 2009 18:59:27 -0000 1.13 *************** *** 66,70 **** 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ ! fsl-soc.c mpc8xx.c pq2.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ cuboot-ebony.c treeboot-ebony.c prpmc2800.c \ --- 66,70 ---- 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ ! fsl-soc.c mpc8xx.c pq2.c ugecon.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ cuboot-ebony.c treeboot-ebony.c prpmc2800.c \ *************** *** 76,80 **** cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c src-boot := $(src-wlib) $(src-plat) empty.c --- 76,80 ---- cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c gamecube.c wii.c src-boot := $(src-wlib) $(src-plat) empty.c *************** *** 253,256 **** --- 253,258 ---- image-$(CONFIG_MPC7448HPC2) += cuImage.mpc7448hpc2 image-$(CONFIG_PPC_C2K) += cuImage.c2k + image-$(CONFIG_GAMECUBE) += dtbImage.gamecube + image-$(CONFIG_WII) += dtbImage.wii # Board port in arch/powerpc/platform/amigaone/Kconfig Index: wrapper =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wrapper 25 Oct 2009 18:56:55 -0000 1.4 --- wrapper 25 Oct 2009 18:59:27 -0000 1.5 *************** *** 230,233 **** --- 230,236 ---- platformo=$object/cuboot-85xx.o ;; + wii|gamecube) + link_address='0x500000' + ;; esac |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:40
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Merge gc-linux-v2.6.31. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig.cputype 25 Oct 2009 18:56:56 -0000 1.12 --- Kconfig.cputype 25 Oct 2009 18:59:27 -0000 1.13 *************** *** 285,289 **** config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x default y --- 285,289 ---- config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON default y |
|
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 |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:38
|
Update of /cvsroot/gc-linux/linux/drivers/serial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/serial Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:56:56 -0000 1.11 --- Makefile 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 80,81 **** --- 80,82 ---- obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o + obj-$(CONFIG_SERIAL_USBGECKO) += usbgecko.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.12 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.13 *************** *** 1452,1454 **** --- 1452,1467 ---- Add support for UART controller on timberdale. + config SERIAL_USBGECKO + bool "USBGecko adapter on the Nintendo GameCube/Wii" + depends on GAMECUBE_EXI + select SERIAL_CORE + help + This is a driver for the USB Gecko adapter for the Nintendo GameCube + and Wii gaming consoles. It provides a console and a tty interface. + + If you have an adapter like this, say Y here, otherwise say N. + + To compile this driver as a module, choose M here: the + module will be called usbgecko. + endmenu |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:38
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Makefile 25 Oct 2009 18:56:56 -0000 1.35 --- Makefile 25 Oct 2009 18:59:28 -0000 1.36 *************** *** 127,130 **** --- 127,131 ---- obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ + obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o # Platform or fallback drivers go here Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.39 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.40 *************** *** 1669,1672 **** --- 1669,1691 ---- endchoice + config FB_GAMECUBE + bool "Nintendo GameCube/Wii frame buffer" + depends on FB && GAMECUBE_COMMON + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the Nintendo GameCube. + + config WII_AVE_RVL + bool "Nintendo Wii audio/video encoder support" + depends on FB_GAMECUBE && WII + select I2C_GPIO + select I2C + default y + help + Say Y here to support the audio/video encoder found in the + Nintendo Wii video game console. + config FB_AU1100 bool "Au1100 LCD Driver" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:38
|
Update of /cvsroot/gc-linux/linux/drivers/net/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/net/usb Modified Files: usbnet.c Log Message: Merge gc-linux-v2.6.31. Index: usbnet.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** usbnet.c 25 Oct 2009 18:56:56 -0000 1.8 --- usbnet.c 25 Oct 2009 18:59:28 -0000 1.9 *************** *** 547,551 **** --- 547,553 ---- // during some PM-driven resume scenarios, // these (async) unlinks complete immediately + spin_unlock(&q->lock); retval = usb_unlink_urb (urb); + spin_lock(&q->lock); if (retval != -EINPROGRESS && retval != 0) devdbg (dev, "unlink urb err, %d", retval); |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:38
|
Update of /cvsroot/gc-linux/linux/drivers/input/keyboard In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/input/keyboard Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:56:56 -0000 1.11 --- Makefile 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 32,33 **** --- 32,34 ---- obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o + obj-$(CONFIG_KEYBOARD_WII) += rvl-stkbd.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.15 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.16 *************** *** 311,314 **** --- 311,325 ---- module will be called sunkbd. + config KEYBOARD_WII + tristate "Nintendo Wii USB keyboard IOS glue" + depends on (STARLET_IOS && !USB) + help + Say Y here if you have a Nintendo Wii console running Linux and have + a keyboard attached to one of its USB ports. + This driver uses the IOS interface glue to access the USB keyboard. + + To compile this driver as a module, choose M here: the + module will be called rvl-stkbd. + config KEYBOARD_SH_KEYSC tristate "SuperH KEYSC keypad support" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/sound/ppc Modified Files: Kconfig Makefile gcn-ai.c gcn-mic.c Log Message: Merge gc-linux-v2.6.31. Index: gcn-mic.c =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-mic.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gcn-mic.c 1 Feb 2009 18:29:35 -0000 1.9 --- gcn-mic.c 25 Oct 2009 18:59:28 -0000 1.10 *************** *** 613,618 **** DBG("enter\n"); ! card = snd_card_new(index, id, THIS_MODULE, 0); ! if (!card) { mic_printk(KERN_ERR, "unable to create sound card\n"); goto err_card; --- 613,618 ---- DBG("enter\n"); ! retval = snd_card_create(index, id, THIS_MODULE, 0, &card); ! if (retval < 0) { mic_printk(KERN_ERR, "unable to create sound card\n"); goto err_card; Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 25 Oct 2009 18:53:46 -0000 1.12 --- Makefile 25 Oct 2009 18:59:28 -0000 1.13 *************** *** 5,10 **** --- 5,13 ---- snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o + snd-gcn-objs := gcn-ai.o # Toplevel Module Dependency obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o obj-$(CONFIG_SND_PS3) += snd_ps3.o + obj-$(CONFIG_SND_GAMECUBE) += snd-gcn.o + obj-$(CONFIG_SND_GAMECUBE_MIC) += gcn-mic.o Index: gcn-ai.c =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gcn-ai.c 1 Feb 2009 18:29:35 -0000 1.14 --- gcn-ai.c 25 Oct 2009 18:59:28 -0000 1.15 *************** *** 486,491 **** int retval; ! card = snd_card_new(index, id, THIS_MODULE, sizeof(struct snd_gcn)); ! if (!card) { drv_printk(KERN_ERR, "failed to allocate card\n"); return -ENOMEM; --- 486,491 ---- int retval; ! retval = snd_card_create(index, id, THIS_MODULE, sizeof(struct snd_gcn), &card); ! if (retval < 0) { drv_printk(KERN_ERR, "failed to allocate card\n"); return -ENOMEM; Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Kconfig 25 Oct 2009 18:53:46 -0000 1.21 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.22 *************** *** 50,52 **** --- 50,70 ---- default "2000" + config SND_GAMECUBE + tristate "Nintendo GameCube/Wii" + depends on SND && GAMECUBE_COMMON + help + Say Y here to include support for audio on the Nintendo GameCube/Wii. + + To compile this driver as a module, choose M here: the module + will be called snd-gcn. + + config SND_GAMECUBE_MIC + tristate "Nintendo GameCube Microphone (DOL-022)" + depends on SND && GAMECUBE_EXI && EXPERIMENTAL + help + If you say yes to this option, support will be included for the + Nintendo GameCube Microphone (DOL-022). + + If in doubt, say N here. + endif # SND_PPC |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile 25 Oct 2009 18:56:56 -0000 1.33 --- Makefile 25 Oct 2009 18:59:27 -0000 1.34 *************** *** 104,107 **** --- 104,109 ---- obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ + obj-$(CONFIG_GAMECUBE_EXI) += exi/ + obj-$(CONFIG_GAMECUBE_SI) += input/si/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.9 --- Kconfig 25 Oct 2009 18:59:27 -0000 1.10 *************** *** 51,54 **** --- 51,56 ---- source "drivers/i2c/Kconfig" + source "drivers/exi/Kconfig" + source "drivers/spi/Kconfig" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/include/linux Modified Files: fb.h gpio.h i2c-gpio.h kexec.h linux_logo.h Log Message: Merge gc-linux-v2.6.31. Index: linux_logo.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/linux_logo.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** linux_logo.h 25 Oct 2009 18:56:56 -0000 1.1 --- linux_logo.h 25 Oct 2009 18:59:28 -0000 1.2 *************** *** 39,42 **** --- 39,43 ---- extern const struct linux_logo logo_blackfin_clut224; extern const struct linux_logo logo_dec_clut224; + extern const struct linux_logo logo_gcn_clut224; extern const struct linux_logo logo_mac_clut224; extern const struct linux_logo logo_parisc_clut224; Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gpio.h 25 Oct 2009 18:53:46 -0000 1.5 --- gpio.h 25 Oct 2009 18:59:28 -0000 1.6 *************** *** 50,53 **** --- 50,58 ---- } + static inline int gpio_direction_is_output(unsigned gpio) + { + return -EINVAL; + } + static inline int gpio_get_value(unsigned gpio) { Index: i2c-gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** i2c-gpio.h 25 Oct 2009 18:53:46 -0000 1.5 --- i2c-gpio.h 25 Oct 2009 18:59:28 -0000 1.6 *************** *** 34,37 **** --- 34,38 ---- unsigned int scl_is_open_drain:1; unsigned int scl_is_output_only:1; + unsigned int sda_enforce_dir:1; }; Index: kexec.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/kexec.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kexec.h 25 Oct 2009 18:53:46 -0000 1.3 --- kexec.h 25 Oct 2009 18:59:28 -0000 1.4 *************** *** 53,60 **** typedef unsigned long kimage_entry_t; ! #define IND_DESTINATION 0x1 ! #define IND_INDIRECTION 0x2 ! #define IND_DONE 0x4 ! #define IND_SOURCE 0x8 #define KEXEC_SEGMENT_MAX 16 --- 53,61 ---- typedef unsigned long kimage_entry_t; ! #define IND_DESTINATION 0x01 ! #define IND_INDIRECTION 0x02 ! #define IND_DONE 0x04 ! #define IND_SOURCE 0x08 ! #define IND_NOALLOC 0x10 /* special case for memory preserving code */ #define KEXEC_SEGMENT_MAX 16 *************** *** 126,129 **** --- 127,132 ---- extern struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order); + extern int kimage_add_preserved_region(struct kimage *image, unsigned long to, + unsigned long from, int length); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** fb.h 25 Oct 2009 18:56:56 -0000 1.37 --- fb.h 25 Oct 2009 18:59:28 -0000 1.38 *************** *** 39,42 **** --- 39,47 ---- #define FBIOGET_DISPINFO 0x4618 + #define FBIOWAITRETRACE 0x4619 + #define FBIOWAITPEFINISH 0x4620 + #define FBIOVIRTTOPHYS 0x4621 + #define FBIOFLIP 0x4622 + #define FBIOFLIPHACK 0x4623 /* libsdl */ #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ *************** *** 913,917 **** #define fb_writeb __raw_writeb #define fb_writew __raw_writew ! #define fb_writel __raw_writel #define fb_writeq __raw_writeq #define fb_memset memset_io --- 918,928 ---- #define fb_writeb __raw_writeb #define fb_writew __raw_writew ! #ifndef CONFIG_FB_GAMECUBE /* XXX Why? O' why? */ ! # define fb_writel __raw_writel ! #else ! extern unsigned int vifb_writel(unsigned int, void *); ! # define fb_writel(b, addr) vifb_writel(b, addr) ! # define fb_writel_real(b, addr) (*(/*volatile*/ u32 __iomem *)(addr) = (b)) ! #endif #define fb_writeq __raw_writeq #define fb_memset memset_io |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/rtc Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:56:56 -0000 1.11 --- Makefile 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 40,43 **** --- 40,44 ---- obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o + obj-$(CONFIG_RTC_DRV_GCN) += rtc-gcn.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.11 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 536,539 **** --- 536,549 ---- NXP PCF50633 used in embedded systems. + config RTC_DRV_GCN + bool "Nintendo GameCube/Wii Real Time Clock and SRAM" + depends on GAMECUBE_EXI + default y + help + If you say yes to this option, support will be included for the + Real Time Clock and SRAM of the Nintendo GameCube/Wii. + + If in doubt, say Y here. + comment "on-CPU RTC drivers" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/usb Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2009 18:56:56 -0000 1.9 --- Makefile 25 Oct 2009 18:59:28 -0000 1.10 *************** *** 19,22 **** --- 19,23 ---- obj-$(CONFIG_USB_U132_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/ + obj-$(CONFIG_USB_WII_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_ISP1760_HCD) += host/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.10 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.11 *************** *** 24,27 **** --- 24,29 ---- default y if SUPERH # r8a66597-hcd default y if MICROBLAZE + default y if WII # rvl-sthcd + default y if STARLET_IOS # rvl-sthcd default PCI |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
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. + |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/configs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/configs Modified Files: gamecube_defconfig wii_defconfig Log Message: Merge gc-linux-v2.6.31. Index: wii_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/wii_defconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wii_defconfig 25 Oct 2009 18:50:26 -0000 1.12 --- wii_defconfig 25 Oct 2009 18:59:27 -0000 1.13 *************** *** 1,6 **** # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.30 ! # Fri Jun 26 21:19:27 2009 # # CONFIG_PPC64 is not set --- 1,6 ---- # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.31 ! # Sun Sep 20 17:14:35 2009 # # CONFIG_PPC64 is not set *************** *** 9,13 **** # Processor support # ! CONFIG_6xx=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set --- 9,13 ---- # Processor support # ! CONFIG_PPC_BOOK3S_32=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set *************** *** 16,19 **** --- 16,20 ---- # CONFIG_E200 is not set CONFIG_PPC_BOOK3S=y + CONFIG_6xx=y CONFIG_PPC_FPU=y # CONFIG_ALTIVEC is not set *************** *** 21,24 **** --- 22,27 ---- CONFIG_PPC_STD_MMU_32=y # CONFIG_PPC_MM_SLICES is not set + CONFIG_PPC_HAVE_PMU_SUPPORT=y + CONFIG_PPC_PERF_CTRS=y # CONFIG_SMP is not set CONFIG_NOT_COHERENT_CACHE=y *************** *** 32,44 **** CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_GENERIC_HWEIGHT=y - CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y --- 35,48 ---- CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y + CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y + CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y *************** *** 61,64 **** --- 65,69 ---- CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + CONFIG_CONSTRUCTORS=y # *************** *** 113,117 **** CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set - # CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y --- 118,121 ---- *************** *** 126,130 **** --- 130,142 ---- CONFIG_SHMEM=y CONFIG_AIO=y + CONFIG_HAVE_PERF_COUNTERS=y + + # + # Performance Counters + # + CONFIG_PERF_COUNTERS=y + CONFIG_EVENT_PROFILE=y # CONFIG_VM_EVENT_COUNTERS is not set + # CONFIG_STRIP_ASM_SYMS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y *************** *** 141,144 **** --- 153,161 ---- CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y + + # + # GCOV-based kernel profiling + # + # CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y *************** *** 153,157 **** # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y ! CONFIG_LBD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set --- 170,174 ---- # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y ! CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set *************** *** 241,244 **** --- 258,262 ---- CONFIG_BINFMT_MISC=m # CONFIG_IOMMU_HELPER is not set + # CONFIG_SWIOTLB is not set CONFIG_PPC_NEED_DMA_SYNC_OPS=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y *************** *** 262,268 **** CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y - CONFIG_UNEVICTABLE_LRU=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_16K_PAGES is not set --- 280,286 ---- CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y + CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_16K_PAGES is not set *************** *** 358,361 **** --- 376,380 ---- # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set + # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set *************** *** 391,399 **** # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y ! # CONFIG_CFG80211 is not set CONFIG_WIRELESS_OLD_REGULATORY=y ! # CONFIG_WIRELESS_EXT is not set # CONFIG_LIB80211 is not set ! # CONFIG_MAC80211 is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set --- 410,435 ---- # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y ! CONFIG_CFG80211=y ! # CONFIG_CFG80211_REG_DEBUG is not set ! # CONFIG_CFG80211_DEBUGFS is not set CONFIG_WIRELESS_OLD_REGULATORY=y ! CONFIG_WIRELESS_EXT=y ! CONFIG_WIRELESS_EXT_SYSFS=y # CONFIG_LIB80211 is not set ! CONFIG_MAC80211=y ! CONFIG_MAC80211_DEFAULT_PS=y ! CONFIG_MAC80211_DEFAULT_PS_VALUE=1 ! ! # ! # Rate control algorithm selection ! # ! # CONFIG_MAC80211_RC_PID is not set ! CONFIG_MAC80211_RC_MINSTREL=y ! # CONFIG_MAC80211_RC_DEFAULT_PID is not set ! CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y ! CONFIG_MAC80211_RC_DEFAULT="minstrel" ! # CONFIG_MAC80211_LEDS is not set ! # CONFIG_MAC80211_DEBUGFS is not set ! # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set *************** *** 449,452 **** --- 485,489 ---- # CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_LEGACY is not set + # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set CONFIG_HAVE_IDE=y *************** *** 472,479 **** # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set - - # - # Some SCSI devices (e.g. CD jukebox) support multiple LUNs - # CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set --- 509,512 ---- *************** *** 501,505 **** # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y - CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set --- 534,537 ---- *************** *** 521,524 **** --- 553,557 ---- # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_B44 is not set + # CONFIG_KS8842 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set *************** *** 554,557 **** --- 587,591 ---- # CONFIG_USB_NET_CDC_SUBSET is not set # CONFIG_USB_NET_ZAURUS is not set + # CONFIG_USB_NET_INT51X1 is not set # CONFIG_WAN is not set # CONFIG_PPP is not set *************** *** 586,595 **** CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ATKBD is not set - # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set ! # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set ! # CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set --- 620,630 ---- CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_LKKBD is not set ! # CONFIG_KEYBOARD_GPIO is not set ! # CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set ! # CONFIG_KEYBOARD_SUNKBD is not set ! # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set *************** *** 599,602 **** --- 634,638 ---- # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_GPIO is not set + # CONFIG_MOUSE_SYNAPTICS_I2C is not set CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ANALOG is not set *************** *** 717,721 **** # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set - # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set --- 753,756 ---- *************** *** 729,732 **** --- 764,772 ---- CONFIG_GAMECUBE_EXI=y # CONFIG_SPI is not set + + # + # PPS support + # + # CONFIG_PPS is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y *************** *** 779,799 **** # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_REGULATOR is not set ! ! # ! # Multimedia devices ! # ! ! # ! # Multimedia core support ! # ! # CONFIG_VIDEO_DEV is not set ! # CONFIG_DVB_CORE is not set ! # CONFIG_VIDEO_MEDIA is not set ! ! # ! # Multimedia drivers ! # ! # CONFIG_DAB is not set # --- 819,825 ---- # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set + # CONFIG_AB3100_CORE is not set # CONFIG_REGULATOR is not set ! # CONFIG_MEDIA_SUPPORT is not set # *************** *** 872,875 **** --- 898,906 ---- # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set + CONFIG_SND_RAWMIDI_SEQ=y + # CONFIG_SND_OPL3_LIB_SEQ is not set + # CONFIG_SND_OPL4_LIB_SEQ is not set + # CONFIG_SND_SBAWE_SEQ is not set + # CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set *************** *** 909,913 **** CONFIG_HID_CHICONY=m CONFIG_HID_CYPRESS=m ! CONFIG_DRAGONRISE_FF=m CONFIG_HID_EZKEY=m CONFIG_HID_KYE=m --- 940,945 ---- CONFIG_HID_CHICONY=m CONFIG_HID_CYPRESS=m ! CONFIG_HID_DRAGONRISE=m ! CONFIG_DRAGONRISE_FF=y CONFIG_HID_EZKEY=m CONFIG_HID_KYE=m *************** *** 926,933 **** CONFIG_HID_SONY=m CONFIG_HID_SUNPLUS=m # CONFIG_GREENASIA_FF is not set # CONFIG_HID_TOPSEED is not set ! CONFIG_THRUSTMASTER_FF=m ! CONFIG_ZEROPLUS_FF=m CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y --- 958,971 ---- CONFIG_HID_SONY=m CONFIG_HID_SUNPLUS=m + CONFIG_HID_GREENASIA=m # CONFIG_GREENASIA_FF is not set + CONFIG_HID_SMARTJOYPLUS=m + CONFIG_SMARTJOYPLUS_FF=y # CONFIG_HID_TOPSEED is not set ! CONFIG_HID_THRUSTMASTER=m ! CONFIG_THRUSTMASTER_FF=y ! CONFIG_HID_WACOM=m ! CONFIG_HID_ZEROPLUS=m ! CONFIG_ZEROPLUS_FF=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y *************** *** 964,967 **** --- 1002,1007 ---- # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_OHCI_HCD=y + # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set + # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set # CONFIG_USB_OHCI_HCD_PPC_OF is not set CONFIG_USB_OHCI_HCD_MIPC=y *************** *** 1064,1067 **** --- 1104,1108 ---- CONFIG_MMC_SDHCI_IO_ACCESSORS=y # CONFIG_MMC_SDHCI_OF is not set + # CONFIG_MMC_SDHCI_PLTFM is not set CONFIG_MMC_SDHCI_MIPC=y # CONFIG_MMC_WBSD is not set *************** *** 1101,1104 **** --- 1142,1146 ---- # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set + # CONFIG_RTC_DRV_RX8025 is not set # *************** *** 1129,1132 **** --- 1171,1178 ---- # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set + + # + # TI VLYNQ + # # CONFIG_STAGING is not set *************** *** 1146,1154 **** # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set - CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y --- 1192,1201 ---- # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set + CONFIG_FILE_LOCKING=y + CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y *************** *** 1227,1231 **** # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set ! # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set --- 1274,1283 ---- # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set ! CONFIG_CIFS=m ! # CONFIG_CIFS_STATS is not set ! # CONFIG_CIFS_WEAK_PW_HASH is not set ! # CONFIG_CIFS_XATTR is not set ! # CONFIG_CIFS_DEBUG2 is not set ! # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set *************** *** 1299,1302 **** --- 1351,1355 ---- CONFIG_HAVE_LMB=y CONFIG_NLATTR=y + CONFIG_GENERIC_ATOMIC64=y # *************** *** 1319,1330 **** CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y ! CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y ! # CONFIG_DEBUG_MUTEXES is not set ! # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y --- 1372,1387 ---- CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y ! # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set + CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y ! CONFIG_DEBUG_MUTEXES=y ! # CONFIG_DEBUG_LOCK_ALLOC is not set ! # CONFIG_PROVE_LOCKING is not set ! # CONFIG_LOCK_STAT is not set ! CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y *************** *** 1338,1342 **** # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set - # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set --- 1395,1398 ---- *************** *** 1352,1369 **** CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_RING_BUFFER=y CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y ! ! # ! # Tracers ! # # CONFIG_FUNCTION_TRACER is not set # CONFIG_PREEMPT_TRACER is not set ! # CONFIG_SCHED_TRACER is not set ! CONFIG_CONTEXT_SWITCH_TRACER=y ! # CONFIG_EVENT_TRACER is not set CONFIG_BOOT_TRACER=y ! # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set # CONFIG_KMEMTRACE is not set --- 1408,1427 ---- CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y + CONFIG_EVENT_TRACING=y + CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACING=y + CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y ! CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set + # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set ! CONFIG_SCHED_TRACER=y CONFIG_BOOT_TRACER=y ! CONFIG_BRANCH_PROFILE_NONE=y ! # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set ! # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set # CONFIG_KMEMTRACE is not set *************** *** 1371,1381 **** --- 1429,1444 ---- # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_FTRACE_STARTUP_TEST is not set + # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set + # CONFIG_KMEMCHECK is not set + # CONFIG_PPC_DISABLE_WERROR is not set + CONFIG_PPC_WERROR=y CONFIG_PRINT_STACK_DEPTH=64 # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set + # CONFIG_PPC_EMULATED_STATS is not set # CONFIG_CODE_PATCHING_SELFTEST is not set # CONFIG_FTR_FIXUP_SELFTEST is not set *************** *** 1407,1411 **** # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set ! # CONFIG_CRYPTO is not set # CONFIG_PPC_CLOCK is not set CONFIG_PPC_LIB_RHEAP=y --- 1470,1568 ---- # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set ! CONFIG_CRYPTO=y ! ! # ! # Crypto core or helper ! # ! # CONFIG_CRYPTO_FIPS is not set ! CONFIG_CRYPTO_ALGAPI=y ! CONFIG_CRYPTO_ALGAPI2=y ! CONFIG_CRYPTO_AEAD2=y ! CONFIG_CRYPTO_BLKCIPHER=y ! CONFIG_CRYPTO_BLKCIPHER2=y ! CONFIG_CRYPTO_HASH2=y ! CONFIG_CRYPTO_RNG2=y ! CONFIG_CRYPTO_PCOMP=y ! CONFIG_CRYPTO_MANAGER=y ! CONFIG_CRYPTO_MANAGER2=y ! # CONFIG_CRYPTO_GF128MUL is not set ! # CONFIG_CRYPTO_NULL is not set ! CONFIG_CRYPTO_WORKQUEUE=y ! # CONFIG_CRYPTO_CRYPTD is not set ! # CONFIG_CRYPTO_AUTHENC is not set ! # CONFIG_CRYPTO_TEST is not set ! ! # ! # Authenticated Encryption with Associated Data ! # ! # CONFIG_CRYPTO_CCM is not set ! # CONFIG_CRYPTO_GCM is not set ! # CONFIG_CRYPTO_SEQIV is not set ! ! # ! # Block modes ! # ! # CONFIG_CRYPTO_CBC is not set ! # CONFIG_CRYPTO_CTR is not set ! # CONFIG_CRYPTO_CTS is not set ! CONFIG_CRYPTO_ECB=y ! # CONFIG_CRYPTO_LRW is not set ! # CONFIG_CRYPTO_PCBC is not set ! # CONFIG_CRYPTO_XTS is not set ! ! # ! # Hash modes ! # ! # CONFIG_CRYPTO_HMAC is not set ! # CONFIG_CRYPTO_XCBC is not set ! ! # ! # Digest ! # ! # CONFIG_CRYPTO_CRC32C is not set ! # CONFIG_CRYPTO_MD4 is not set ! # CONFIG_CRYPTO_MD5 is not set ! # CONFIG_CRYPTO_MICHAEL_MIC is not set ! # CONFIG_CRYPTO_RMD128 is not set ! # CONFIG_CRYPTO_RMD160 is not set ! # CONFIG_CRYPTO_RMD256 is not set ! # CONFIG_CRYPTO_RMD320 is not set ! # CONFIG_CRYPTO_SHA1 is not set ! # CONFIG_CRYPTO_SHA256 is not set ! # CONFIG_CRYPTO_SHA512 is not set ! # CONFIG_CRYPTO_TGR192 is not set ! # CONFIG_CRYPTO_WP512 is not set ! ! # ! # Ciphers ! # ! CONFIG_CRYPTO_AES=y ! # CONFIG_CRYPTO_ANUBIS is not set ! CONFIG_CRYPTO_ARC4=y ! # CONFIG_CRYPTO_BLOWFISH is not set ! # CONFIG_CRYPTO_CAMELLIA is not set ! # CONFIG_CRYPTO_CAST5 is not set ! # CONFIG_CRYPTO_CAST6 is not set ! # CONFIG_CRYPTO_DES is not set ! # CONFIG_CRYPTO_FCRYPT is not set ! # CONFIG_CRYPTO_KHAZAD is not set ! # CONFIG_CRYPTO_SALSA20 is not set ! # CONFIG_CRYPTO_SEED is not set ! # CONFIG_CRYPTO_SERPENT is not set ! # CONFIG_CRYPTO_TEA is not set ! # CONFIG_CRYPTO_TWOFISH is not set ! ! # ! # Compression ! # ! # CONFIG_CRYPTO_DEFLATE is not set ! # CONFIG_CRYPTO_ZLIB is not set ! # CONFIG_CRYPTO_LZO is not set ! ! # ! # Random Number Generation ! # ! # CONFIG_CRYPTO_ANSI_CPRNG is not set ! # CONFIG_CRYPTO_HW is not set # CONFIG_PPC_CLOCK is not set CONFIG_PPC_LIB_RHEAP=y Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/gamecube_defconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gamecube_defconfig 28 Mar 2009 20:44:19 -0000 1.7 --- gamecube_defconfig 25 Oct 2009 18:59:27 -0000 1.8 *************** *** 1,6 **** # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.29 ! # Sat Mar 28 19:52:22 2009 # # CONFIG_PPC64 is not set --- 1,6 ---- # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.31 ! # Sun Sep 20 17:00:48 2009 # # CONFIG_PPC64 is not set *************** *** 9,13 **** # Processor support # ! CONFIG_6xx=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set --- 9,13 ---- # Processor support # ! CONFIG_PPC_BOOK3S_32=y # CONFIG_PPC_85xx is not set # CONFIG_PPC_8xx is not set *************** *** 15,18 **** --- 15,20 ---- # CONFIG_44x is not set # CONFIG_E200 is not set + CONFIG_PPC_BOOK3S=y + CONFIG_6xx=y CONFIG_PPC_FPU=y # CONFIG_ALTIVEC is not set *************** *** 20,23 **** --- 22,27 ---- CONFIG_PPC_STD_MMU_32=y # CONFIG_PPC_MM_SLICES is not set + CONFIG_PPC_HAVE_PMU_SUPPORT=y + CONFIG_PPC_PERF_CTRS=y # CONFIG_SMP is not set CONFIG_NOT_COHERENT_CACHE=y *************** *** 31,43 **** CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_GENERIC_HWEIGHT=y - CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_ARCH_NO_VIRT_TO_BUS is not set --- 35,48 ---- CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y + CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y + CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_ARCH_NO_VIRT_TO_BUS is not set *************** *** 53,60 **** --- 58,68 ---- CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y + CONFIG_DTC=y # CONFIG_DEFAULT_UIMAGE is not set # CONFIG_PPC_DCR_NATIVE is not set # CONFIG_PPC_DCR_MMIO is not set + CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + CONFIG_CONSTRUCTORS=y # *************** *** 98,101 **** --- 106,112 ---- CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" + CONFIG_RD_GZIP=y + # CONFIG_RD_BZIP2 is not set + # CONFIG_RD_LZMA is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y *************** *** 118,122 **** --- 129,141 ---- CONFIG_SHMEM=y CONFIG_AIO=y + CONFIG_HAVE_PERF_COUNTERS=y + + # + # Performance Counters + # + CONFIG_PERF_COUNTERS=y + CONFIG_EVENT_PROFILE=y # CONFIG_VM_EVENT_COUNTERS is not set + # CONFIG_STRIP_ASM_SYMS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y *************** *** 133,136 **** --- 152,161 ---- CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y + + # + # GCOV-based kernel profiling + # + # CONFIG_GCOV_KERNEL is not set + # CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y *************** *** 144,149 **** # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y ! CONFIG_LBD=y ! # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set --- 169,173 ---- # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y ! CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set *************** *** 166,171 **** # Platform support # - CONFIG_PPC_MULTIPLATFORM=y - CONFIG_CLASSIC32=y # CONFIG_PPC_CHRP is not set # CONFIG_MPC5121_ADS is not set --- 190,193 ---- *************** *** 194,197 **** --- 216,221 ---- # CONFIG_GAMECUBE_VIDEO_UDBG is not set CONFIG_GAMECUBE_RSW=y + # CONFIG_AMIGAONE is not set + # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set # CONFIG_IPIC is not set # CONFIG_MPIC is not set *************** *** 229,232 **** --- 253,257 ---- CONFIG_BINFMT_MISC=m # CONFIG_IOMMU_HELPER is not set + # CONFIG_SWIOTLB is not set CONFIG_PPC_NEED_DMA_SYNC_OPS=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y *************** *** 250,257 **** CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y ! CONFIG_UNEVICTABLE_LRU=y CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_16K_PAGES is not set # CONFIG_PPC_64K_PAGES is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_PROC_DEVICETREE=y --- 275,285 ---- CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y ! CONFIG_HAVE_MLOCK=y ! CONFIG_HAVE_MLOCKED_PAGE_BIT=y ! CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_16K_PAGES is not set # CONFIG_PPC_64K_PAGES is not set + # CONFIG_PPC_256K_PAGES is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_PROC_DEVICETREE=y *************** *** 287,292 **** # CONFIG_TASK_SIZE_BOOL is not set CONFIG_TASK_SIZE=0xc0000000 - # CONFIG_CONSISTENT_START_BOOL is not set - CONFIG_CONSISTENT_START=0xff100000 # CONFIG_CONSISTENT_SIZE_BOOL is not set CONFIG_CONSISTENT_SIZE=0x00200000 --- 315,318 ---- *************** *** 296,300 **** # Networking options # - CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set --- 322,325 ---- *************** *** 307,311 **** CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y ! CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set --- 332,336 ---- CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y ! # CONFIG_IP_PNP_BOOTP is not set CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set *************** *** 345,348 **** --- 370,375 ---- # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + # CONFIG_PHONET is not set + # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set *************** *** 352,355 **** --- 379,383 ---- # # CONFIG_NET_PKTGEN is not set + # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set *************** *** 357,361 **** # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set - # CONFIG_PHONET is not set # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set --- 385,388 ---- *************** *** 398,403 **** # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y ! CONFIG_GAMECUBE_GQR=y ! # CONFIG_GAMECUBE_MI is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_C2PORT is not set --- 425,430 ---- # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y ! CONFIG_GAMECUBE_GQR=m ! CONFIG_GAMECUBE_MI=m # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_C2PORT is not set *************** *** 431,434 **** --- 458,462 ---- # CONFIG_MII is not set CONFIG_GAMECUBE_BBA=y + # CONFIG_ETHOC is not set # CONFIG_DNET is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set *************** *** 440,443 **** --- 468,472 ---- # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_B44 is not set + # CONFIG_KS8842 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set *************** *** 448,452 **** # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set - # CONFIG_IWLWIFI_LEDS is not set # --- 477,480 ---- *************** *** 466,470 **** # CONFIG_INPUT=y ! # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set --- 494,498 ---- # CONFIG_INPUT=y ! CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_POLLDEV is not set *************** *** 482,490 **** CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ATKBD is not set - # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set - # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_JOYSTICK=y --- 510,518 ---- CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set + # CONFIG_KEYBOARD_SUNKBD is not set + # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_JOYSTICK=y *************** *** 564,567 **** --- 592,600 ---- CONFIG_GAMECUBE_EXI=y # CONFIG_SPI is not set + + # + # PPS support + # + # CONFIG_PPS is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set *************** *** 587,606 **** # CONFIG_MFD_TMIO is not set # CONFIG_REGULATOR is not set ! ! # ! # Multimedia devices ! # ! ! # ! # Multimedia core support ! # ! # CONFIG_VIDEO_DEV is not set ! # CONFIG_DVB_CORE is not set ! # CONFIG_VIDEO_MEDIA is not set ! ! # ! # Multimedia drivers ! # ! # CONFIG_DAB is not set # --- 620,624 ---- # CONFIG_MFD_TMIO is not set # CONFIG_REGULATOR is not set ! # CONFIG_MEDIA_SUPPORT is not set # *************** *** 639,642 **** --- 657,661 ---- # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set + # CONFIG_FB_BROADSHEET is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set *************** *** 679,682 **** --- 698,706 ---- # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set + # CONFIG_SND_RAWMIDI_SEQ is not set + # CONFIG_SND_OPL3_LIB_SEQ is not set + # CONFIG_SND_OPL4_LIB_SEQ is not set + # CONFIG_SND_SBAWE_SEQ is not set + # CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set *************** *** 699,703 **** # Special HID drivers # - CONFIG_HID_COMPAT=y # CONFIG_USB_SUPPORT is not set # CONFIG_MMC is not set --- 723,726 ---- *************** *** 744,750 **** # on-CPU RTC drivers # ! # CONFIG_RTC_DRV_PPC is not set # CONFIG_DMADEVICES is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set --- 767,778 ---- # on-CPU RTC drivers # ! CONFIG_RTC_DRV_GENERIC=y # CONFIG_DMADEVICES is not set + # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set + + # + # TI VLYNQ + # # CONFIG_STAGING is not set *************** *** 756,759 **** --- 784,788 ---- # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y + # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4_FS is not set *************** *** 763,771 **** # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set - CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y --- 792,801 ---- # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set + CONFIG_FILE_LOCKING=y + CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y *************** *** 777,780 **** --- 807,815 ---- # + # Caches + # + # CONFIG_FSCACHE is not set + + # # CD-ROM/DVD Filesystems # *************** *** 824,827 **** --- 859,863 ---- # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set + # CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y *************** *** 835,839 **** CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y - # CONFIG_SUNRPC_REGISTER_V4 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set --- 871,874 ---- *************** *** 895,898 **** --- 930,934 ---- # CONFIG_NLS_UTF8 is not set # CONFIG_DLM is not set + CONFIG_BINARY_PRINTF=y # *************** *** 908,921 **** # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set ! CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_HAVE_LMB=y # # Kernel hacking # ! # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y --- 944,960 ---- # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set ! CONFIG_ZLIB_INFLATE=y ! CONFIG_DECOMPRESS_GZIP=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_HAVE_LMB=y + CONFIG_NLATTR=y + CONFIG_GENERIC_ATOMIC64=y # # Kernel hacking # ! CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y *************** *** 930,933 **** --- 969,973 ---- # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 + # CONFIG_DETECT_HUNG_TASK is not set CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y *************** *** 935,943 **** # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y ! # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y --- 975,987 ---- # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set + CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y ! # CONFIG_DEBUG_LOCK_ALLOC is not set ! # CONFIG_PROVE_LOCKING is not set ! # CONFIG_LOCK_STAT is not set ! CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y *************** *** 951,955 **** # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set - # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set --- 995,998 ---- *************** *** 959,987 **** CONFIG_LATENCYTOP=y CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_RING_BUFFER=y CONFIG_TRACING=y ! ! # ! # Tracers ! # # CONFIG_FUNCTION_TRACER is not set # CONFIG_PREEMPT_TRACER is not set ! # CONFIG_SCHED_TRACER is not set ! CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_BOOT_TRACER=y ! # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set ! # CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_PRINT_STACK_DEPTH=64 # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set ! # CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_CODE_PATCHING_SELFTEST is not set # CONFIG_FTR_FIXUP_SELFTEST is not set --- 1002,1044 ---- CONFIG_LATENCYTOP=y CONFIG_SYSCTL_SYSCALL_CHECK=y + # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y + CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y + CONFIG_EVENT_TRACING=y + CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACING=y ! CONFIG_GENERIC_TRACER=y ! CONFIG_TRACING_SUPPORT=y ! CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set + # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set ! CONFIG_SCHED_TRACER=y CONFIG_BOOT_TRACER=y ! CONFIG_BRANCH_PROFILE_NONE=y ! # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set ! # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set ! # CONFIG_KMEMTRACE is not set ! # CONFIG_WORKQUEUE_TRACER is not set ! # CONFIG_BLK_DEV_IO_TRACE is not set ! # CONFIG_FTRACE_STARTUP_TEST is not set ! # CONFIG_RING_BUFFER_BENCHMARK is not set ! # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set + # CONFIG_KMEMCHECK is not set + # CONFIG_PPC_DISABLE_WERROR is not set + CONFIG_PPC_WERROR=y CONFIG_PRINT_STACK_DEPTH=64 # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set ! # CONFIG_PPC_EMULATED_STATS is not set # CONFIG_CODE_PATCHING_SELFTEST is not set # CONFIG_FTR_FIXUP_SELFTEST is not set |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/input In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/input Modified Files: Kconfig Log Message: Merge gc-linux-v2.6.31. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/Kconfig,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.15 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.16 *************** *** 181,184 **** --- 181,186 ---- source "drivers/input/gameport/Kconfig" + source "drivers/input/si/Kconfig" + endmenu |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/exi In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/exi Modified Files: exi-hw.c Log Message: Merge gc-linux-v2.6.31. Index: exi-hw.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-hw.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** exi-hw.c 28 Mar 2009 20:44:19 -0000 1.20 --- exi-hw.c 25 Oct 2009 18:59:28 -0000 1.21 *************** *** 660,665 **** static int exi_cmd_transfer(struct exi_command *cmd) { - static u8 exi_aligned_transfer_buf[EXI_DMA_ALIGN+1] - __attribute__ ((aligned(EXI_DMA_ALIGN+1))); struct exi_channel *exi_channel = cmd->exi_channel; struct exi_command *post_cmd = &exi_channel->post_cmd; --- 660,663 ---- *************** *** 729,751 **** * Maximum transfer size here is 31+31=62 bytes. */ ! ! /* ! * On transfer sizes greater than or equal to 32 bytes ! * we can optimize the transfer by performing a 32-byte ! * DMA transfer using a specially aligned temporary buffer, ! * followed by a non-DMA transfer for the remaining bytes. ! */ ! if (pre_len + post_len > EXI_DMA_ALIGN) { ! post_len = pre_len + post_len - (EXI_DMA_ALIGN+1); ! post_data = pre_data + EXI_DMA_ALIGN+1; ! len = EXI_DMA_ALIGN+1; ! data = exi_aligned_transfer_buf; ! memcpy(data, pre_data, EXI_DMA_ALIGN+1); ! pre_len = 0; ! } else { ! exi_transfer_raw(exi_channel, pre_data, ! pre_len + post_len, opcode); ! goto done; ! } } --- 727,733 ---- * Maximum transfer size here is 31+31=62 bytes. */ ! exi_transfer_raw(exi_channel, pre_data, ! pre_len + post_len, opcode); ! goto done; } |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/mm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/mm Modified Files: pgtable_32.c Log Message: Merge gc-linux-v2.6.31. Index: pgtable_32.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pgtable_32.c 25 Oct 2009 18:53:45 -0000 1.7 --- pgtable_32.c 25 Oct 2009 18:59:27 -0000 1.8 *************** *** 193,199 **** */ if (mem_init_done && (p < virt_to_phys(high_memory))) { ! printk("__ioremap(): phys addr 0x%llx is RAM lr %p\n", ! (unsigned long long)p, __builtin_return_address(0)); ! return NULL; } #endif --- 193,209 ---- */ if (mem_init_done && (p < virt_to_phys(high_memory))) { ! /* ! * On some systems, though, we may want to remap normal RAM ! * that we have memreserve'd at the device tree. ! * But we can't do that safely if we are using BATs. ! * ! */ ! if (!__map_without_bats) { ! printk(KERN_WARNING ! "__ioremap(): phys addr 0x%llx is RAM lr %p\n", ! (unsigned long long)p, ! __builtin_return_address(0)); ! return NULL; ! } } #endif |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/include/asm Modified Files: dma-mapping.h udbg.h Log Message: Merge gc-linux-v2.6.31. Index: dma-mapping.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dma-mapping.h 25 Oct 2009 18:56:55 -0000 1.4 --- dma-mapping.h 25 Oct 2009 18:59:27 -0000 1.5 *************** *** 17,20 **** --- 17,21 ---- #include <asm/io.h> #include <asm/swiotlb.h> + #include <asm-generic/dma-coherent.h> #define DMA_ERROR_CODE (~(dma_addr_t)0x0) Index: udbg.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/udbg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** udbg.h 25 Oct 2009 18:53:45 -0000 1.6 --- udbg.h 25 Oct 2009 18:59:27 -0000 1.7 *************** *** 52,55 **** --- 52,56 ---- extern void __init udbg_init_40x_realmode(void); extern void __init udbg_init_cpm(void); + extern void __init udbg_init_usbgecko(void); #endif /* __KERNEL__ */ |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/mmc/host Modified Files: Kconfig Makefile Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 25 Oct 2009 18:56:56 -0000 1.3 --- Makefile 25 Oct 2009 18:59:28 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o + obj-$(CONFIG_MMC_SDHCI_MIPC) += sdhci-mipc.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Kconfig 25 Oct 2009 18:56:56 -0000 1.3 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.4 *************** *** 120,123 **** --- 120,134 ---- YMMV. + config MMC_SDHCI_MIPC + tristate "Nintendo Wii SDHCI support via 'mini'" + depends on MMC_SDHCI && STARLET_MINI + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Nintendo Wii Secure Digital Host Controller + Interface. The SDHC hardware is accessed via the 'mini' firmware + replacement for Starlet. + + If unsure, say N. + config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:59:37
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Merge gc-linux-v2.6.31. Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** gcn-di.c 1 Feb 2009 18:29:35 -0000 1.25 --- gcn-di.c 25 Oct 2009 18:59:28 -0000 1.26 *************** *** 1822,1834 **** spin_lock_irqsave(&ddev->lock, flags); - req = ddev->req; ddev->req = NULL; - spin_unlock_irqrestore(&ddev->lock, flags); if (req) { - __blk_end_request(req, error, req->current_nr_sectors << 9); spin_lock_irqsave(&ddev->queue_lock, flags); blk_start_queue(ddev->queue); spin_unlock_irqrestore(&ddev->queue_lock, flags); --- 1822,1832 ---- spin_lock_irqsave(&ddev->lock, flags); req = ddev->req; ddev->req = NULL; spin_unlock_irqrestore(&ddev->lock, flags); if (req) { spin_lock_irqsave(&ddev->queue_lock, flags); + __blk_end_request_cur(req, error); blk_start_queue(ddev->queue); spin_unlock_irqrestore(&ddev->queue_lock, flags); *************** *** 1844,1861 **** unsigned long flags; size_t len; ! while ((req = elv_next_request(q))) { ! /* keep our reads within limits */ ! if (req->sector + req->current_nr_sectors > ddev->nr_sectors) { ! drv_printk(KERN_ERR, "reading past end\n"); ! end_request(req, 0); ! continue; } /* it doesn't make sense to write to this device */ if (rq_data_dir(req) == WRITE) { drv_printk(KERN_ERR, "write attempted\n"); ! end_request(req, 0); ! continue; } --- 1842,1869 ---- unsigned long flags; size_t len; + int error; ! req = blk_peek_request(q); ! while (req) { ! spin_lock_irqsave(&ddev->lock, flags); ! ! if (ddev->req || ddev->cmd) { ! blk_stop_queue(q); ! if (ddev->cmd) ! set_bit(__DI_START_QUEUE, &ddev->flags); ! spin_unlock_irqrestore(&ddev->lock, flags); ! break; } + blk_start_request(req); + error = -EIO; + + if (!blk_fs_request(req)) + goto done; + /* it doesn't make sense to write to this device */ if (rq_data_dir(req) == WRITE) { drv_printk(KERN_ERR, "write attempted\n"); ! goto done; } *************** *** 1863,1898 **** if ((ddev->flags & DI_MEDIA_CHANGED)) { drv_printk(KERN_ERR, "media changed, aborting\n"); ! end_request(req, 0); ! continue; ! } ! ! spin_lock_irqsave(&ddev->lock, flags); ! ! /* we can schedule just a single request each time */ ! if (ddev->req || ddev->cmd) { ! blk_stop_queue(q); ! if (ddev->cmd) ! set_bit(__DI_START_QUEUE, &ddev->flags); ! spin_unlock_irqrestore(&ddev->lock, flags); ! break; } ! blkdev_dequeue_request(req); ! ! /* ignore requests that we can't handle */ ! if (!blk_fs_request(req)) { ! spin_unlock_irqrestore(&ddev->lock, flags); ! continue; } - /* store the request being handled ... */ ddev->req = req; - blk_stop_queue(q); - spin_unlock_irqrestore(&ddev->lock, flags); ! /* ... and launch the corresponding read sector command */ ! start = req->sector << KERNEL_SECTOR_SHIFT; ! len = req->current_nr_sectors << KERNEL_SECTOR_SHIFT; di_op_readsector(cmd, ddev, start >> 2, --- 1871,1890 ---- if ((ddev->flags & DI_MEDIA_CHANGED)) { drv_printk(KERN_ERR, "media changed, aborting\n"); ! goto done; } ! /* keep our reads within limits */ ! if (blk_rq_pos(req) + ! blk_rq_cur_sectors(req) > ddev->nr_sectors) { ! drv_printk(KERN_ERR, "reading past end\n"); ! goto done; } ddev->req = req; spin_unlock_irqrestore(&ddev->lock, flags); ! /* launch the corresponding read sector command */ ! start = blk_rq_pos(req) << KERNEL_SECTOR_SHIFT; ! len = blk_rq_cur_bytes(req); di_op_readsector(cmd, ddev, start >> 2, *************** *** 1901,1904 **** --- 1893,1902 ---- cmd->done = di_request_done; di_run_command(cmd); + error = 0; + break; + done: + spin_unlock_irqrestore(&ddev->lock, flags); + if (!__blk_end_request_cur(req, error)) + req = blk_peek_request(q); } } *************** *** 2152,2156 **** } ! blk_queue_hardsect_size(queue, DI_SECTOR_SIZE); blk_queue_dma_alignment(queue, DI_DMA_ALIGN); blk_queue_max_phys_segments(queue, 1); --- 2150,2154 ---- } ! blk_queue_logical_block_size(queue, DI_SECTOR_SIZE); blk_queue_dma_alignment(queue, DI_DMA_ALIGN); blk_queue_max_phys_segments(queue, 1); |
|
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc/boot Modified Files: wrapper Log Message: Forward to v2.6.31. Index: wrapper =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wrapper 25 Oct 2009 18:53:45 -0000 1.3 --- wrapper 25 Oct 2009 18:56:55 -0000 1.4 *************** *** 226,229 **** --- 226,233 ---- binary=y ;; + xpedite52*) + link_address='0x1400000' + platformo=$object/cuboot-85xx.o + ;; esac |
|
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/drivers/net/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/net/usb Modified Files: usbnet.c Log Message: Forward to v2.6.31. Index: usbnet.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** usbnet.c 25 Oct 2009 18:53:45 -0000 1.7 --- usbnet.c 25 Oct 2009 18:56:56 -0000 1.8 *************** *** 38,41 **** --- 38,42 ---- #include <linux/netdevice.h> #include <linux/etherdevice.h> + #include <linux/ctype.h> #include <linux/ethtool.h> #include <linux/workqueue.h> *************** *** 157,160 **** --- 158,191 ---- EXPORT_SYMBOL_GPL(usbnet_get_endpoints); + static u8 nibble(unsigned char c) + { + if (likely(isdigit(c))) + return c - '0'; + c = toupper(c); + if (likely(isxdigit(c))) + return 10 + c - 'A'; + return 0; + } + + int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) + { + int tmp, i; + unsigned char buf [13]; + + tmp = usb_string(dev->udev, iMACAddress, buf, sizeof buf); + if (tmp != 12) { + dev_dbg(&dev->udev->dev, + "bad MAC string %d fetch, %d\n", iMACAddress, tmp); + if (tmp >= 0) + tmp = -EINVAL; + return tmp; + } + for (i = tmp = 0; i < 6; i++, tmp += 2) + dev->net->dev_addr [i] = + (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]); + return 0; + } + EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); + static void intr_complete (struct urb *urb); *************** *** 204,209 **** skb->protocol = eth_type_trans (skb, dev->net); ! dev->stats.rx_packets++; ! dev->stats.rx_bytes += skb->len; if (netif_msg_rx_status (dev)) --- 235,240 ---- skb->protocol = eth_type_trans (skb, dev->net); ! dev->net->stats.rx_packets++; ! dev->net->stats.rx_bytes += skb->len; if (netif_msg_rx_status (dev)) *************** *** 367,371 **** devdbg (dev, "drop"); error: ! dev->stats.rx_errors++; skb_queue_tail (&dev->done, skb); } --- 398,402 ---- devdbg (dev, "drop"); error: ! dev->net->stats.rx_errors++; skb_queue_tail (&dev->done, skb); } *************** *** 390,395 **** if (skb->len < dev->net->hard_header_len) { entry->state = rx_cleanup; ! dev->stats.rx_errors++; ! dev->stats.rx_length_errors++; if (netif_msg_rx_err (dev)) devdbg (dev, "rx length %d", skb->len); --- 421,426 ---- if (skb->len < dev->net->hard_header_len) { entry->state = rx_cleanup; ! dev->net->stats.rx_errors++; ! dev->net->stats.rx_length_errors++; if (netif_msg_rx_err (dev)) devdbg (dev, "rx length %d", skb->len); *************** *** 399,407 **** /* stalls need manual reset. this is rare ... except that * when going through USB 2.0 TTs, unplug appears this way. ! * we avoid the highspeed version of the ETIMEOUT/EILSEQ * storm, recovering as needed. */ case -EPIPE: ! dev->stats.rx_errors++; usbnet_defer_kevent (dev, EVENT_RX_HALT); // FALLTHROUGH --- 430,438 ---- /* stalls need manual reset. this is rare ... except that * when going through USB 2.0 TTs, unplug appears this way. ! * we avoid the highspeed version of the ETIMEDOUT/EILSEQ * storm, recovering as needed. */ case -EPIPE: ! dev->net->stats.rx_errors++; usbnet_defer_kevent (dev, EVENT_RX_HALT); // FALLTHROUGH *************** *** 421,425 **** case -ETIME: case -EILSEQ: ! dev->stats.rx_errors++; if (!timer_pending (&dev->delay)) { mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES); --- 452,456 ---- case -ETIME: case -EILSEQ: ! dev->net->stats.rx_errors++; if (!timer_pending (&dev->delay)) { mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES); *************** *** 435,444 **** /* data overrun ... flush fifo? */ case -EOVERFLOW: ! dev->stats.rx_over_errors++; // FALLTHROUGH default: entry->state = rx_cleanup; ! dev->stats.rx_errors++; if (netif_msg_rx_err (dev)) devdbg (dev, "rx status %d", urb_status); --- 466,475 ---- /* data overrun ... flush fifo? */ case -EOVERFLOW: ! dev->net->stats.rx_over_errors++; // FALLTHROUGH default: entry->state = rx_cleanup; ! dev->net->stats.rx_errors++; if (netif_msg_rx_err (dev)) devdbg (dev, "rx status %d", urb_status); *************** *** 553,558 **** if (netif_msg_ifdown (dev)) devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld", ! dev->stats.rx_packets, dev->stats.tx_packets, ! dev->stats.rx_errors, dev->stats.tx_errors ); --- 584,589 ---- if (netif_msg_ifdown (dev)) devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld", ! net->stats.rx_packets, net->stats.tx_packets, ! net->stats.rx_errors, net->stats.tx_errors ); *************** *** 861,868 **** if (urb->status == 0) { ! dev->stats.tx_packets++; ! dev->stats.tx_bytes += entry->length; } else { ! dev->stats.tx_errors++; switch (urb->status) { --- 892,899 ---- if (urb->status == 0) { ! dev->net->stats.tx_packets++; ! dev->net->stats.tx_bytes += entry->length; } else { ! dev->net->stats.tx_errors++; switch (urb->status) { *************** *** 990,994 **** drop: retval = NET_XMIT_SUCCESS; ! dev->stats.tx_dropped++; if (skb) dev_kfree_skb_any (skb); --- 1021,1025 ---- drop: retval = NET_XMIT_SUCCESS; ! dev->net->stats.tx_dropped++; if (skb) dev_kfree_skb_any (skb); *************** *** 1186,1195 **** net->netdev_ops = &usbnet_netdev_ops; - #ifdef CONFIG_COMPAT_NET_DEV_OPS - net->hard_start_xmit = usbnet_start_xmit; - net->open = usbnet_open; - net->stop = usbnet_stop; - net->tx_timeout = usbnet_tx_timeout; - #endif net->watchdog_timeo = TX_TIMEOUT_JIFFIES; net->ethtool_ops = &usbnet_ethtool_ops; --- 1217,1220 ---- |
|
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/drivers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Makefile 25 Oct 2009 18:53:45 -0000 1.32 --- Makefile 25 Oct 2009 18:56:56 -0000 1.33 *************** *** 73,76 **** --- 73,77 ---- obj-$(CONFIG_RTC_LIB) += rtc/ obj-y += i2c/ media/ + obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_POWER_SUPPLY) += power/ *************** *** 106,109 **** --- 107,112 ---- obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ + obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ + obj-y += ieee802154/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.8 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.9 *************** *** 53,56 **** --- 53,58 ---- source "drivers/spi/Kconfig" + source "drivers/pps/Kconfig" + source "drivers/gpio/Kconfig" *************** *** 105,108 **** --- 107,112 ---- source "drivers/uio/Kconfig" + source "drivers/vlynq/Kconfig" + source "drivers/xen/Kconfig" |
|
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/include/linux Modified Files: fb.h Added Files: linux_logo.h Log Message: Forward to v2.6.31. --- NEW FILE: linux_logo.h --- #ifndef _LINUX_LINUX_LOGO_H #define _LINUX_LINUX_LOGO_H /* * Linux logo to be displayed on boot * * Copyright (C) 1996 Larry Ewing (le...@is...) * Copyright (C) 1996,1998 Jakub Jelinek (jj...@su...) * Copyright (C) 2001 Greg Banks <gn...@al...> * Copyright (C) 2001 Jan-Benedict Glaw <jb...@lu...> * Copyright (C) 2003 Geert Uytterhoeven <ge...@li...> * * Serial_console ascii image can be any size, * but should contain %s to display the version */ #include <linux/init.h> #define LINUX_LOGO_MONO 1 /* monochrome black/white */ #define LINUX_LOGO_VGA16 2 /* 16 colors VGA text palette */ #define LINUX_LOGO_CLUT224 3 /* 224 colors */ #define LINUX_LOGO_GRAY256 4 /* 256 levels grayscale */ struct linux_logo { int type; /* one of LINUX_LOGO_* */ unsigned int width; unsigned int height; unsigned int clutsize; /* LINUX_LOGO_CLUT224 only */ const unsigned char *clut; /* LINUX_LOGO_CLUT224 only */ const unsigned char *data; }; extern const struct linux_logo logo_linux_mono; extern const struct linux_logo logo_linux_vga16; extern const struct linux_logo logo_linux_clut224; extern const struct linux_logo logo_blackfin_vga16; extern const struct linux_logo logo_blackfin_clut224; extern const struct linux_logo logo_dec_clut224; extern const struct linux_logo logo_mac_clut224; extern const struct linux_logo logo_parisc_clut224; extern const struct linux_logo logo_sgi_clut224; extern const struct linux_logo logo_sun_clut224; extern const struct linux_logo logo_superh_mono; extern const struct linux_logo logo_superh_vga16; extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; extern const struct linux_logo logo_spe_clut224; extern const struct linux_logo *fb_find_logo(int depth); #ifdef CONFIG_FB_LOGO_EXTRA extern void fb_append_extra_logo(const struct linux_logo *logo, unsigned int n); #else static inline void fb_append_extra_logo(const struct linux_logo *logo, unsigned int n) {} #endif #endif /* _LINUX_LINUX_LOGO_H */ Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** fb.h 25 Oct 2009 18:53:46 -0000 1.36 --- fb.h 25 Oct 2009 18:56:56 -0000 1.37 *************** *** 678,681 **** --- 678,684 ---- void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps, struct fb_var_screeninfo *var); + + /* teardown any resources to do with this framebuffer */ + void (*fb_destroy)(struct fb_info *info); }; *************** *** 787,790 **** --- 790,795 ---- from userspace */ #define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ + #define FBINFO_MISC_FIRMWARE 0x40000 /* a replaceable firmware + inited framebuffer */ /* A driver may set this flag to indicate that it does want a set_par to be *************** *** 815,818 **** --- 820,824 ---- int flags; struct mutex lock; /* Lock for open/release/ioctl funcs */ + struct mutex mm_lock; /* Lock for fb_mmap and smem_* fields */ struct fb_var_screeninfo var; /* Current var */ struct fb_fix_screeninfo fix; /* Current fix */ *************** *** 855,859 **** void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ ! void *par; }; --- 861,870 ---- void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ ! void *par; ! /* we need the PCI or similiar aperture base/size not ! smem_start/size as smem_start may just be an object ! allocated inside the aperture so may not actually overlap */ ! resource_size_t aperture_base; ! resource_size_t aperture_size; }; *************** *** 894,898 **** #define fb_memset sbus_memset_io ! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) #define fb_readb __raw_readb --- 905,909 ---- #define fb_memset sbus_memset_io ! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) #define fb_readb __raw_readb |
165 messages has been excluded from this view by a project administrator.
