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: <aot...@us...> - 2004-10-19 09:46:25
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9216/drivers Modified Files: Makefile Log Message: Merged 2.6.9 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 15 Aug 2004 22:33:04 -0000 1.4 +++ Makefile 19 Oct 2004 09:46:09 -0000 1.5 @@ -7,6 +7,7 @@ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ +obj-y += video/ obj-$(CONFIG_ACPI_BOOT) += acpi/ # PnP must come after ACPI since it will eventually need to check if acpi # was used and do nothing if so @@ -15,6 +16,13 @@ # char/ comes before serial/ etc so that the VT console is the boot-time # default. obj-y += char/ + +# i810fb depends on char/agp/ +obj-$(CONFIG_FB_I810) += video/i810/ + +# we also need input/serio early so serio bus is initialized by the time +# serial drivers start registering their serio ports +obj-$(CONFIG_SERIO) += input/serio/ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ net/ media/ @@ -26,7 +34,7 @@ obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_FUSION) += message/ obj-$(CONFIG_IEEE1394) += ieee1394/ -obj-y += cdrom/ video/ +obj-y += cdrom/ obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_DIO) += dio/ @@ -39,7 +47,6 @@ obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_INPUT) += input/ obj-$(CONFIG_GAMEPORT) += input/gameport/ -obj-$(CONFIG_SERIO) += input/serio/ obj-$(CONFIG_I2O) += message/ obj-$(CONFIG_I2C) += i2c/ obj-$(CONFIG_W1) += w1/ @@ -50,5 +57,6 @@ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ +obj-$(CONFIG_MMC) += mmc/ obj-y += firmware/ obj-$(CONFIG_EXI) += exi/ |
|
From: <aot...@us...> - 2004-10-19 09:46:25
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9216/arch/ppc/platforms Modified Files: Makefile gamecube.c Log Message: Merged 2.6.9 Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 15 Aug 2004 22:33:03 -0000 1.12 +++ Makefile 19 Oct 2004 09:46:08 -0000 1.13 @@ -21,23 +21,21 @@ obj-$(CONFIG_PMAC_BACKLIGHT) += pmac_backlight.o obj-$(CONFIG_PREP_RESIDUAL) += residual.o obj-$(CONFIG_ADIR) += adir_setup.o adir_pic.o adir_pci.o -obj-$(CONFIG_EST8260) += est8260_setup.o -obj-$(CONFIG_PQ2ADS) += pq2ads_setup.o +obj-$(CONFIG_PQ2ADS) += pq2ads.o obj-$(CONFIG_TQM8260) += tqm8260_setup.o obj-$(CONFIG_EV64260) += ev64260_setup.o obj-$(CONFIG_GEMINI) += gemini_pci.o gemini_setup.o gemini_prom.o obj-$(CONFIG_K2) += k2.o -obj-$(CONFIG_LOPEC) += lopec_setup.o lopec_pci.o +obj-$(CONFIG_LOPEC) += lopec.o obj-$(CONFIG_MCPN765) += mcpn765.o obj-$(CONFIG_MENF1) += menf1_setup.o menf1_pci.o -obj-$(CONFIG_MVME5100) += mvme5100_setup.o mvme5100_pci.o +obj-$(CONFIG_MVME5100) += mvme5100.o obj-$(CONFIG_PAL4) += pal4_setup.o pal4_pci.o obj-$(CONFIG_PCORE) += pcore.o obj-$(CONFIG_POWERPMC250) += powerpmc250.o obj-$(CONFIG_PPLUS) += pplus.o obj-$(CONFIG_PRPMC750) += prpmc750.o obj-$(CONFIG_PRPMC800) += prpmc800.o -obj-$(CONFIG_RPX8260) += rpx8260.o obj-$(CONFIG_SANDPOINT) += sandpoint.o obj-$(CONFIG_SBC82xx) += sbc82xx.o obj-$(CONFIG_SPRUCE) += spruce.o Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gamecube.c 30 Jul 2004 19:41:12 -0000 1.19 +++ gamecube.c 19 Oct 2004 09:46:08 -0000 1.20 @@ -14,6 +14,7 @@ #include <asm/bitops.h> #include <asm/bootinfo.h> #include <asm/machdep.h> +#include <asm/pgtable.h> #include "console.h" #include "gamecube.h" |
|
From: <he...@us...> - 2004-10-11 22:05:01
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11649 Modified Files: head.S Log Message: Simplified (grouped) the patch a little bit. Index: head.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/head.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- head.S 15 Aug 2004 22:33:03 -0000 1.4 +++ head.S 11 Oct 2004 22:04:28 -0000 1.5 @@ -69,14 +69,6 @@ /* The following functions we call must not modify r3 or r4..... */ -#ifdef CONFIG_GAMECUBE_CONSOLE - /* setup the framebuffer for the debug console */ - lis r8, 0xcc00 - lis r5, 0x00c0 - stw r5, 0x201c(r8) - addi r5, r5, 1280 - stw r5, 0x2024(r8) -#endif #ifdef CONFIG_6xx /* On PReP we must look at the OpenFirmware pointer and sanity * test it. On other platforms, we disable the MMU right now @@ -108,11 +100,25 @@ #else bl disable_6xx_mmu #endif -#ifndef CONFIG_GAMECUBE + +#ifdef CONFIG_GAMECUBE + /* convert our starting address to physical layout format */ + clrlwi r3, r3, 3 +#else bl disable_6xx_l1cache CLEAR_CACHES -#endif +#endif /* CONFIG_GAMECUBE */ + +#ifdef CONFIG_GAMECUBE_CONSOLE + /* setup the framebuffer address for the early debug console */ + lis r8, 0xcc00 + lis r5, 0x00c0 + stw r5, 0x201c(r8) + addi r5, r5, 1280 + stw r5, 0x2024(r8) +#endif /* CONFIG_GAMECUBE_CONSOLE */ + #endif #ifdef CONFIG_8xx @@ -152,9 +158,6 @@ /* Get the load address. */ -#ifdef CONFIG_GAMECUBE - clrlwi r3, r3, 3 -#endif - subi r3, r3, 4 /* Get the actual IP, not NIP */ + subi r3, r3, 4 /* Get the actual IP, not NIP */ b relocate |
|
From: <he...@us...> - 2004-10-07 20:43:56
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23970 Modified Files: news.xml Log Message: s/linux/Linux/ Index: news.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/news.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- news.xml 7 Oct 2004 19:02:34 -0000 1.22 +++ news.xml 7 Oct 2004 20:43:44 -0000 1.23 @@ -9,7 +9,7 @@ <item> <date>29 September 2004</date> <title>(old news) Big Blue's Power, Linux and gaming consoles</title> - <text>Their Linux on Power Architecture Developer's Corner Community site includes a <a href="http://www-106.ibm.com/developerworks/linux/power/community.html#games">small section</a> on PowerPC based gaming consoles running linux. Guess one?</text> + <text>Their Linux on Power Architecture Developer's Corner Community site includes a <a href="http://www-106.ibm.com/developerworks/linux/power/community.html#games">small section</a> on PowerPC based gaming consoles running Linux. Guess one?</text> </item> <item> <date>21 July 2004</date> |
|
From: <he...@us...> - 2004-10-07 19:39:06
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6587 Modified Files: building_a_kernel.xml Log Message: Fixed the directory name used in several places, to match the currently suggested toolchain. Added a change directory, maybe useful for people textually typing the provided instructions. Index: building_a_kernel.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/building_a_kernel.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- building_a_kernel.xml 6 Oct 2004 23:27:32 -0000 1.1 +++ building_a_kernel.xml 7 Oct 2004 19:38:45 -0000 1.2 @@ -87,7 +87,8 @@ </verbatim> <verbatim> - $ cp doltool ../powerpc-linux-uclibc/bin/ + $ cp doltool ../ppc-linux-uclibc-toolchain-20040609/bin/ + $ cd .. </verbatim> </sect2> @@ -100,7 +101,7 @@ 1. Add the bin directory of your ppc toolchain tree to your PATH environment variable.</p> <verbatim> - $ export PATH=$PATH:/home/isobel/powerpc-linux-uclibc/bin + $ export PATH=$PATH:/home/isobel/ppc-linux-uclibc-toolchain-20040609/bin </verbatim> <q>NOTE: This will temporarily add the toolchain directory to your path. If |
|
From: <he...@us...> - 2004-10-07 19:02:45
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31339 Modified Files: news.xml Log Message: 7 October 2004, Build your own kernel, step by step 29 September 2004, Big Blue's Power, Linux and gaming consoles Index: news.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/news.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- news.xml 21 Jul 2004 21:09:15 -0000 1.21 +++ news.xml 7 Oct 2004 19:02:34 -0000 1.22 @@ -2,6 +2,16 @@ <?xml-stylesheet href="news.xsl" type="text/xsl"?> <news> <item> + <date>7 October 2004</date> + <title>Build your own kernel, step by step</title> + <text>Ever wanted to build a customized GameCube Linux kernel and didn't know where to start? Follow <a href="docs/building_a_kernel.html">this</a> guide.</text> + </item> + <item> + <date>29 September 2004</date> + <title>(old news) Big Blue's Power, Linux and gaming consoles</title> + <text>Their Linux on Power Architecture Developer's Corner Community site includes a <a href="http://www-106.ibm.com/developerworks/linux/power/community.html#games">small section</a> on PowerPC based gaming consoles running linux. Guess one?</text> + </item> + <item> <date>21 July 2004</date> <title>Play Robby Roto on gc-linux!</title> <text>Thanks to Steve_- you have <a href="http://www.gc-linux.org/down/mame-PoC.tar.bz2">here</a> a base system for playing Robby Roto. See the <a href="http://www.gc-linux.org/down/mame-PoC.txt">readme.txt</a> for rudimentary help.</text> |
|
From: <he...@us...> - 2004-10-06 23:27:43
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14857 Modified Files: howtodevelop.xml Added Files: building_a_kernel.xml Log Message: Added a new document explaining how to build a kernel image from sources. Linked the new document to the existing howtodevelop document. --- NEW FILE: building_a_kernel.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <?xml-stylesheet type="text/xsl" href="iparticle.xsl"?> <iparticle> <info> <!-- <revhistory> <revision> <revnumber>1</revnumber> <revdate>6 October 2004</revdate> <revdescription>Initial revision</revdescription> </revision> </revhistory> --> <title>Building a GameCube Linux Kernel</title> <author>Albert Herranz</author> <date>6 October 2004</date> </info> <sect2> <title>Introduction</title> This guide explains briefly the necessary steps to produce a Linux kernel suitable for the GameCube, using a Linux PC. </sect2> <sect2> <title>Requisites</title> <list> <item> A working Linux PC with the typical development tools installed. You will also need a C++ compiler (g++ recommended) to build doltool. </item> <item> A compatible ppc toolchain, for cross-compiling. For example, <a href="http://prdownloads.sourceforge.net/gc-linux/ppc-linux-uclibc-toolchain-20040609.tar.bz2?download">ppc-linux-uclibc-toolchain-20040609.tar.bz2</a> (23 MB). </item> <item> Doltool for Linux sources, <a href="http://www.dextrose.com/files/gc/homebrewn/applications/doltool.0.3.2.linux-TenOfTen.tgz">doltool.0.3.2.linux-TenOfTen.tgz</a> (20 KB). </item> <item> Linux kernel sources, from <a href="http://www.kernel.org">www.kernel.org</a>. </item> <item> GameCube Linux kernel patches, from the <a href="http://sourceforge.net/project/showfiles.php?group_id=98581&package_id=108737">SourceForge project files</a> page. </item> <item> (Optional) A ramdisk image, when building a ramdisk based kernel. Grab this <a href="http://www.gc-linux.org/down/ramdisk.image.gz">sample image</a> (250 KB) if you are building a kernel for the first time. </item> </list> </sect2> <sect2> <title>Installing the toolchain and doltool</title> <p> 1. Uncompress the toolchain to a directory where you have write access.</p> <verbatim> $ cd /home/isobel $ tar xjvf /temp/ppc-linux-uclibc-toolchain-20040609.tar.bz2 </verbatim> <p> 2. Uncompress doltool sources there too.</p> <verbatim> $ tar xzvf /temp/doltool.0.3.2.linux-TenOfTen.tgz </verbatim> <p> 3. Build doltool, and copy the resulting binary to the toolchain bin directory.</p> <verbatim> $ cd doltool.0.3.2.linux-TenOfTen $ g++ -o doltool *cpp </verbatim> <verbatim> $ cp doltool ../powerpc-linux-uclibc/bin/ </verbatim> </sect2> <sect2> <title>Preparing to use the toolchain</title> <p> 1. Add the bin directory of your ppc toolchain tree to your PATH environment variable.</p> <verbatim> $ export PATH=$PATH:/home/isobel/powerpc-linux-uclibc/bin </verbatim> <q>NOTE: This will temporarily add the toolchain directory to your path. If you plan to frequently use the toolchain you may want to modify your login script accordingly.</q> </sect2> <sect2> <title>Installing and patching the Linux kernel sources</title> <p> 1. Put the kernel tarball, and the GameCube Linux kernel patches, in a directory where you have permissions.</p> <verbatim> $ ls linux-2.6.8.1.tar.bz2 linux-2.6.8-gc.patch.gz </verbatim> <q>CAUTION: Do NOT use the /usr/src directory !!!</q> <p> 2. Unpack the kernel sources.</p> <verbatim> $ tar xjvf linux-2.6.8.1.tar.bz2 </verbatim> <p> 3. If you plan to build a ramdisk based kernel, copy your ramdisk image into the kernel source tree.</p> <verbatim> $ cp /temp/ramdisk.image.gz linux-2.6.8.1/arch/ppc/boot/images/ </verbatim> <p> 4. Apply the GameCube Linux patch corresponding to your kernel version.</p> <verbatim> $ cd linux-2.6.8.1 $ gunzip -cd <../linux-2.6.8-gc.patch.gz | patch -p1 </verbatim> <q>HINT: The patch for 2.6.8 applies also to 2.6.8.1</q> </sect2> <sect2> <title>Building the kernel image</title> <p> 1. Change to the parent directory of your recently patched kernel source tree.</p> <verbatim> $ cd .. $ ls linux-2.6.8.1 linux-2.6.8.1.tar.bz2 linux-2.6.8-gc.patch.gz </verbatim> <p> 2. Start with the default GameCube Linux kernel configuration as a base config.</p> <verbatim> $ cp linux-2.6.8.1/arch/ppc/configs/gamecube_defconfig linux-2.6.8.1/.config </verbatim> <p> 3. (Optional) Modify the kernel configuration.</p> <verbatim> $ make -C linux-2.6.8.1 ARCH=ppc CROSS_COMPILE=powerpc-linux- menuconfig </verbatim> <q>HINT: To change the initial IP settings of your kernel, go to "Platform options" and change "Default bootloader kernel arguments". </q> <p> 4. Build your kernel image.</p> If you are building a ramdisk based kernel, then do a: <verbatim> $ make -C linux-2.6.8.1 ARCH=ppc CROSS_COMPILE=powerpc-linux- zImage.initrd $ doltool -d linux-2.6.8.1/arch/ppc/boot/images/zImage.initrd.elf </verbatim> <q>HINT: If you are building a non ramdisk based kernel, the target is zImage instead of zImage.initrd.</q> <p> The resulting Linux kernel image in DOL format can be located at, </p> <p> <b><l>linux-2.6.8.1/arch/ppc/boot/images/zImage.initrd.dol</l></b> </p> </sect2> </iparticle> Index: howtodevelop.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/howtodevelop.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- howtodevelop.xml 22 Jun 2004 21:47:14 -0000 1.7 +++ howtodevelop.xml 6 Oct 2004 23:27:32 -0000 1.8 @@ -16,6 +16,10 @@ <p>If your development machine is an x86 PC or a Mac running Mac OS X, you need a cross-compiler. Arthur Othieno has contributed a ready-to-use cross-compiler for x86 available for download from the <a href="http://sourceforge.net/project/showfiles.php?group_id=98581&package_id=120824">SourceForge project files</a> page. You can of course also build your own cross-compiler from the GCC and binutils sources.</p> <p>There are also cross-compilers for Linux, Windows and Mac OS X available at <a href="http://heliscar.com/greg/">http://heliscar.com/greg/</a> and <a href="http://www.hangar-eleven.de/en/">http://www.hangar-eleven.de/en/</a>. However, we have found problems compiling recent kernels with them.</p> + <h2>Kernel Building</h2> + + <p>The document <a href="building_a_kernel.html">Building a GameCube Linux Kernel</a> explains briefly how to build a kernel image from sources.</p> + <h2>Running Executables on the GameCube</h2> <p>The GameCube cannot read any CDs/DVDs that can be burnt. There are several methods to run your code on the GameCube, but we will show briefly only the "PSOload" method.</p> |
|
From: <he...@us...> - 2004-10-06 19:55:26
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25863 Modified Files: iparticle.xsl Log Message: The date tag was incorrectly used for both revisions and "normal" dates. Use revdate tag now for revision dates. Index: iparticle.xsl =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/iparticle.xsl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- iparticle.xsl 23 Jan 2004 11:50:39 -0000 1.1.1.1 +++ iparticle.xsl 6 Oct 2004 19:55:15 -0000 1.2 @@ -63,7 +63,7 @@ <tr><xsl:apply-templates /></tr> </xsl:template> - <xsl:template match="revnumber|date|revdescription"> + <xsl:template match="revnumber|revdate|revdescription"> <td><xsl:apply-templates /></td> </xsl:template> |
|
From: <he...@us...> - 2004-09-30 18:42:29
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27261 Modified Files: download.xml Log Message: Minor changes: - Been slightly more optimistic. - Added approximate size of latest kernel image binary. - Do not use an own section for the GameCube Linux Alpha kernel patches, and don't confuse it with the main kernel patches. Index: download.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/download.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- download.xml 19 Sep 2004 20:46:10 -0000 1.8 +++ download.xml 30 Sep 2004 18:42:19 -0000 1.9 @@ -4,17 +4,19 @@ <info> <title>Download</title> <author>Michael Steil (Updated by Albert Herranz)</author> - <date>19 September 2004</date> + <date>30 September 2004</date> </info> - <p>Linux on the GameCube is steadily maturing. With the help of a PowerPC linux distribution, you can now use your GameCube for some of the goals described in the project roadmap.</p> + <p>Linux on the GameCube is steadily maturing. With the help of a PowerPC linux distribution, you can now use your GameCube for several goals described in the project roadmap.</p> <h2>Linux Kernel Patches</h2> + <p>The patches needed to build a linux kernel for the GameCube are available for download from the <a href="http://sourceforge.net/project/showfiles.php?group_id=98581&package_id=108737">SourceForge project files</a> page.</p> <h2>Latest Kernel Build</h2> + <p>This build always has the latest features, but might not work reliably. (Requires a NFS-served <a href="http://www.tldp.org/HOWTO/NFS-Root.html">root</a> filesystem, like vaguely described <a href="../down/old/zImage-nfs.isobel.txt">here</a>).</p> - <p><a href="../down/zImage.dol">zImage.dol</a></p> + <p><a href="../down/zImage.dol">zImage.dol</a> (~1 MB)</p> <h2>GameCube Linux Alpha</h2> @@ -22,14 +24,12 @@ <p><a href="http://prdownloads.sourceforge.net/gc-linux/gc-linux-alpha.zip?download">gc-linux-alpha.zip</a> (1.1 MB)</p> - <h2>GameCube Linux Kernel Patches</h2> - - <p>This is the kernel used in the "GameCube Linux Alpha".</p> + <p>This is the patch against linux 2.6.1 needed to build the kernel used in the "GameCube Linux Alpha".</p> <p><a href="http://prdownloads.sourceforge.net/gc-linux/linux-2.6.1-gc-2004-02-02.patch?download">linux-2.6.1-gc-2004-02-02.patch</a> (67 KB)</p> <h2>Linuxpreview</h2> - + <p><a href="download.html">Linuxpreview</a> is a tiny application that shows Tux the penguin and the GameCube Linux URL on the GameCube screen. It is a symbol that Linux for the GameCube is coming soon.</p> <p>Linuxpreview can be launched by <a href="http://www.gcdev.com/">PSOload</a>.</p> |
|
From: <he...@us...> - 2004-09-19 20:46:20
|
Update of /cvsroot/gc-linux/htdocs/xml/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv409 Modified Files: download.xml Log Message: Added a more optimistic introductory paragraph. Added a new section pointing where to find the source code patches. Clarified that the latest kernel build needs now nfs-root. Index: download.xml =================================================================== RCS file: /cvsroot/gc-linux/htdocs/xml/en/download.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- download.xml 8 Feb 2004 01:03:31 -0000 1.7 +++ download.xml 19 Sep 2004 20:46:10 -0000 1.8 @@ -3,14 +3,17 @@ <iparticle> <info> <title>Download</title> - <author>Michael Steil</author> - <date>2 February 2004</date> + <author>Michael Steil (Updated by Albert Herranz)</author> + <date>19 September 2004</date> </info> - <p>Linux on the GameCube can't do much yet. It is only suited to demonstraltional purposed right now.</p> + <p>Linux on the GameCube is steadily maturing. With the help of a PowerPC linux distribution, you can now use your GameCube for some of the goals described in the project roadmap.</p> + <h2>Linux Kernel Patches</h2> + <p>The patches needed to build a linux kernel for the GameCube are available for download from the <a href="http://sourceforge.net/project/showfiles.php?group_id=98581&package_id=108737">SourceForge project files</a> page.</p> + <h2>Latest Kernel Build</h2> - <p>This build always has the latest features, but might not work reliably.</p> + <p>This build always has the latest features, but might not work reliably. (Requires a NFS-served <a href="http://www.tldp.org/HOWTO/NFS-Root.html">root</a> filesystem, like vaguely described <a href="../down/old/zImage-nfs.isobel.txt">here</a>).</p> <p><a href="../down/zImage.dol">zImage.dol</a></p> <h2>GameCube Linux Alpha</h2> |
|
From: <aot...@us...> - 2004-08-15 22:33:42
|
Update of /cvsroot/gc-linux/linux/arch/ppc/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/arch/ppc/configs Modified Files: gamecube_defconfig Log Message: Merged 2.6.8{,.1} Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gamecube_defconfig 30 Jul 2004 19:41:12 -0000 1.20 +++ gamecube_defconfig 15 Aug 2004 22:33:03 -0000 1.21 @@ -13,7 +13,6 @@ # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y -# CONFIG_STANDALONE is not set CONFIG_BROKEN_ON_SMP=y # @@ -30,6 +29,7 @@ # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_IOSCHED_NOOP=y @@ -57,6 +57,7 @@ # CONFIG_POWER3 is not set # CONFIG_POWER4 is not set # CONFIG_8xx is not set +# CONFIG_E500 is not set # CONFIG_ALTIVEC is not set # CONFIG_TAU is not set # CONFIG_CPU_FREQ is not set @@ -88,8 +89,10 @@ # CONFIG_EST8260 is not set # CONFIG_SBC82xx is not set # CONFIG_SBS8260 is not set -# CONFIG_RPX6 is not set +# CONFIG_RPX8260 is not set # CONFIG_TQM8260 is not set +# CONFIG_ADS8272 is not set +# CONFIG_LITE5200 is not set CONFIG_GAMECUBE_RESET_SWITCH=y CONFIG_GAMECUBE_DVD_COVER=y # CONFIG_SMP is not set @@ -130,6 +133,8 @@ # # Generic Driver Options # +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y # # Memory Technology Devices (MTD) @@ -181,7 +186,6 @@ # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set # # I2O device support @@ -236,13 +240,13 @@ # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set -# CONFIG_NET_FASTROUTE is not set # CONFIG_NET_HW_FLOWCONTROL is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_NET_CLS_ROUTE is not set # # Network testing @@ -265,7 +269,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_MII is not set CONFIG_GAMECUBE_NET=y -# CONFIG_OAKNET is not set # # Ethernet (1000 Mbit) @@ -380,12 +383,10 @@ # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # -# CONFIG_FTAPE is not set # CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -396,6 +397,11 @@ # CONFIG_I2C is not set # +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# # Misc devices # @@ -414,7 +420,6 @@ # CONFIG_FB=y # CONFIG_FB_CT65550 is not set -# CONFIG_FB_S3TRIO is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_GAMECUBE=y # CONFIG_FB_VIRTUAL is not set @@ -426,7 +431,6 @@ # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_PCI_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y @@ -468,7 +472,10 @@ # # ALSA PowerMac devices # -# CONFIG_SND_POWERMAC is not set + +# +# ALSA PowerMac requires I2C +# CONFIG_SND_GAMECUBE=y # @@ -513,6 +520,8 @@ CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # @@ -590,6 +599,7 @@ # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set @@ -608,10 +618,16 @@ # # Library routines # +# CONFIG_CRC_CCITT is not set # CONFIG_CRC32 is not set # CONFIG_LIBCRC32C is not set # +# Profiling support +# +# CONFIG_PROFILING is not set + +# # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set |
|
From: <aot...@us...> - 2004-08-15 22:33:42
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/arch/ppc/boot/simple Modified Files: Makefile embed_config.c head.S misc-embedded.c Log Message: Merged 2.6.8{,.1} Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 30 Jul 2004 21:06:51 -0000 1.7 +++ Makefile 15 Aug 2004 22:33:03 -0000 1.8 @@ -113,6 +113,11 @@ entrypoint-$(CONFIG_SPRUCE) := 0x00800000 misc-$(CONFIG_SPRUCE) += misc-spruce.o + zimage-$(CONFIG_LITE5200) := zImage-STRIPELF +zimageinitrd-$(CONFIG_LITE5200) := zImage.initrd-STRIPELF + end-$(CONFIG_LITE5200) := lite5200 + cacheflag-$(CONFIG_LITE5200) := -include $(clear_L2_L3) + zimage-$(CONFIG_GAMECUBE) := zImage-DOL zimageinitrd-$(CONFIG_GAMECUBE) := zImage.initrd-DOL end-$(CONFIG_GAMECUBE) := dol @@ -144,11 +149,12 @@ boot-$(CONFIG_RPXCLASSIC) += iic.o pci.o qspan_pci.o boot-$(CONFIG_RPXLITE) += iic.o # Different boards need different serial implementations. -ifeq ($(CONFIG_SERIAL_CONSOLE),y) +ifeq ($(CONFIG_SERIAL_CPM_CONSOLE),y) boot-$(CONFIG_8xx) += m8xx_tty.o boot-$(CONFIG_8260) += m8260_tty.o -boot-$(CONFIG_GT64260_CONSOLE) += gt64260_tty.o endif +boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE) += mpc52xx_tty.o +boot-$(CONFIG_GT64260_CONSOLE) += gt64260_tty.o LIBS := $(common)/lib.a $(bootlib)/lib.a ifeq ($(CONFIG_PPC_PREP),y) Index: embed_config.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- embed_config.c 16 Jun 2004 17:30:42 -0000 1.4 +++ embed_config.c 15 Aug 2004 22:33:03 -0000 1.5 @@ -16,7 +16,7 @@ #endif #ifdef CONFIG_8260 #include <asm/mpc8260.h> -#include <asm/immap_8260.h> +#include <asm/immap_cpm2.h> #endif #ifdef CONFIG_6xx #include <asm/ppc6xx.h> @@ -100,7 +100,7 @@ #endif /* CONFIG_MBX */ #if defined(CONFIG_RPXLITE) || defined(CONFIG_RPXCLASSIC) || \ - defined(CONFIG_RPX6) || defined(CONFIG_EP405) + defined(CONFIG_RPX8260) || defined(CONFIG_EP405) /* Helper functions for Embedded Planet boards. */ /* Because I didn't find anything that would do this....... @@ -150,7 +150,7 @@ } } -#ifdef CONFIG_RPX6 +#ifdef CONFIG_RPX8260 static uint rpx_baseten(u_char *cp) { @@ -418,9 +418,9 @@ { uint scmr, vco_out, clkin; uint plldf, pllmf, corecnf; - volatile immap_t *ip; + volatile cpm2_map_t *ip; - ip = (immap_t *)IMAP_ADDR; + ip = (cpm2_map_t *)CPM_MAP_ADDR; scmr = ip->im_clkrst.car_scmr; /* The clkin is always bus frequency. @@ -460,9 +460,9 @@ { uint scmr, main_clk, clkin; uint pllmf, corecnf; - volatile immap_t *ip; + volatile cpm2_map_t *ip; - ip = (immap_t *)IMAP_ADDR; + ip = (cpm2_map_t *)CPM_MAP_ADDR; scmr = ip->im_clkrst.car_scmr; /* The clkin is always bus frequency. @@ -591,7 +591,7 @@ } #endif /* SBS8260 */ -#ifdef CONFIG_RPX6 +#ifdef CONFIG_RPX8260 void embed_config(bd_t **bdp) { Index: head.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/head.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- head.S 26 Jun 2004 23:04:20 -0000 1.3 +++ head.S 15 Aug 2004 22:33:03 -0000 1.4 @@ -57,7 +57,7 @@ isync #endif -#if defined(CONFIG_MBX) || defined(CONFIG_RPX6) || defined(CONFIG_PPC_PREP) +#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP) mr r29,r3 /* On the MBX860, r3 is the board info pointer. * On the RPXSUPER, r3 points to the NVRAM * configuration keys. @@ -139,7 +139,7 @@ mr r3, r29 #endif -#if defined(CONFIG_MBX) || defined(CONFIG_RPX6) || defined(CONFIG_PPC_PREP) +#if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP) mr r4,r29 /* put the board info pointer where the relocate * routine will find it */ Index: misc-embedded.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- misc-embedded.c 11 May 2004 17:48:35 -0000 1.3 +++ misc-embedded.c 15 Aug 2004 22:33:03 -0000 1.4 @@ -85,7 +85,7 @@ * initialize the serial console port. */ embed_config(&bp); -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) +#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) com_port = serial_init(0, bp); #endif @@ -264,7 +264,9 @@ rec = (struct bi_record *)((unsigned long)rec + rec->size); } puts("Now booting the kernel\n"); +#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) serial_close(com_port); +#endif return (unsigned long)hold_residual; } |
|
From: <aot...@us...> - 2004-08-15 22:33:41
|
Update of /cvsroot/gc-linux/linux/arch/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/arch/ppc Modified Files: Kconfig Log Message: Merged 2.6.8{,.1} Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Kconfig 30 Jul 2004 19:41:12 -0000 1.16 +++ Kconfig 15 Aug 2004 22:33:02 -0000 1.17 @@ -44,18 +44,18 @@ default 6xx config 6xx - bool "6xx/7xx/74xx/8260" + bool "6xx/7xx/74xx/52xx/8260" help There are four types of PowerPC chips supported. The more common types (601, 603, 604, 740, 750, 7400), the Motorola embedded - versions (821, 823, 850, 855, 860, 8260), the IBM embedded versions - (403 and 405) and the high end 64 bit Power processors (POWER 3, - POWER4, and IBM 970 also known as G5) + versions (821, 823, 850, 855, 860, 52xx, 8260), the IBM embedded + versions (403 and 405) and the high end 64 bit Power processors + (POWER 3, POWER4, and IBM 970 also known as G5) Unless you are building a kernel for one of the embedded processor systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx. Note that the kernel runs in 32-bit mode even on 64-bit chips. - Also note that because the 82xx family has a 603e core, specific - support for that chipset is asked later on. + Also note that because the 52xx & 82xx family has a 603e core, + specific support for that chipset is asked later on. config 40x bool "40x" @@ -72,8 +72,21 @@ config 8xx bool "8xx" +config E500 + bool "e500" + endchoice +config BOOKE + bool + depends on E500 + default y + +config FSL_BOOKE + bool + depends on E500 + default y + config PTE_64BIT bool depends on 44x @@ -96,6 +109,21 @@ If in doubt, say Y here. +config SPE + bool "SPE Support" + depends on E500 + ---help--- + This option enables kernel support for the Signal Processing + Extensions (SPE) to the PowerPC processor. The kernel currently + supports saving and restoring SPE registers, and turning on the + 'spe enable' bit so user processes can execute SPE instructions. + + This option is only usefully if you have a processor that supports + SPE (e500, otherwise known as 85xx series), but does not have any + affect on a non-spe cpu (it does, however add code to the kernel). + + If in doubt, say Y here. + config TAU bool "Thermal Management Support" depends on 6xx && !8260 @@ -142,7 +170,7 @@ config MATH_EMULATION bool "Math emulation" - depends on 4xx || 8xx + depends on 4xx || 8xx || E500 ---help--- Some PowerPC chips designed for embedded applications do not have a floating-point unit and therefore do not implement the @@ -163,7 +191,7 @@ fly. This is a nice method to save battery power on notebooks, because the lower the clock speed, the less power the CPU consumes. - For more information, take a look at linux/Documentation/cpu-freq or + For more information, take a look at <file:Documentation/cpu-freq> or at <http://www.brodo.de/cpufreq/> If in doubt, say N. @@ -198,6 +226,7 @@ If in doubt, say Y here. source arch/ppc/platforms/4xx/Kconfig +source arch/ppc/platforms/85xx/Kconfig config PPC64BRIDGE bool @@ -295,7 +324,7 @@ HERMES: Hermes-Pro ISDN/LAN router with integrated 8 x hub - Manufacturer: Multidata Gesellschaft für Datentechnik und Informatik + Manufacturer: Multidata Gesellschaft für Datentechnik und Informatik <http://www.multidata.de/> Date of Release: 2000 (?) End of life: - @@ -560,7 +589,7 @@ config SBS8260 bool "SBS8260" -config RPX6 +config RPX8260 bool "RPXSUPER" config TQM8260 @@ -575,8 +604,25 @@ End of Life: not yet :-) URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf> +config ADS8272 + bool "ADS8272" + +config LITE5200 + bool "Freescale LITE5200 / (IceCube)" + select PPC_MPC52xx + help + Support for the LITE5200 dev board for the MPC5200 from Freescale. + This is for the LITE5200 version 2.0 board. Don't know if it changes + much but it's only been tested on this board version. I think this + board is also known as IceCube. + endchoice +config PQ2ADS + bool + depends on ADS8272 + default y + config GAMECUBE_RESET_SWITCH bool "GameCube Reset button" default n @@ -606,16 +652,37 @@ bool depends on 8xx || 8260 || GAMECUBE default y + +config PPC_MPC52xx + bool config 8260 - bool "MPC8260 CPM Support" if WILLOW + bool "CPM2 Support" if WILLOW depends on 6xx - default y if TQM8260 || RPXSUPER || EST8260 || SBS8260 || SBC82xx + default y if TQM8260 || RPX8260 || EST8260 || SBS8260 || SBC82xx help - The MPC8260 CPM (Communications Processor Module) is a typical - embedded CPU made by Motorola. Selecting this option means that - you wish to build a kernel for a machine with specifically an 8260 - for a CPU. + The MPC8260 is a typical embedded CPU made by Motorola. Selecting + this option means that you wish to build a kernel for a machine with + an 8260 class CPU. + +config 8272 + bool + depends on 6xx + default y if ADS8272 + select 8260 + help + The MPC8272 CPM has a different internal dpram setup than other CPM2 + devices + +config CPM2 + bool + depends on 8260 || MPC8560 + default y + help + The CPM2 (Communications Processor Module) is a coprocessor on + embedded CPUs made by Motorola. Selecting this option means that + you wish to build a kernel for a machine with a CPM2 coprocessor + on it (826x, 827x, 8560). config PPC_CHRP bool @@ -676,6 +743,16 @@ depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT default y +config FSL_OCP + bool + depends on MPC10X_BRIDGE || PPC_MPC52xx + default y + +config MPC10X_OPENPIC + bool + depends on POWERPMC250 || LOPEC || SANDPOINT + default y + config MPC10X_STORE_GATHERING bool "Enable MPC10x store gathering" depends on MPC10X_BRIDGE @@ -698,11 +775,11 @@ config PC_KEYBOARD bool "PC PS/2 style Keyboard" - depends on 4xx || 8260 + depends on 4xx || CPM2 config SERIAL_CONSOLE bool - depends on 8xx || 8260 + depends on 8xx default y config SERIAL_CONSOLE_BAUD @@ -780,39 +857,6 @@ an image of the device tree that the kernel copies from Open Firmware. If unsure, say Y here. -config PPC_RTAS - bool "Support for RTAS (RunTime Abstraction Services) in /proc" - depends on PPC_OF && PROC_FS - ---help--- - When you use this option, you will be able to use RTAS from - userspace. - - RTAS stands for RunTime Abstraction Services and should - provide a portable way to access and set system information. This is - commonly used on RS/6000 (pSeries) computers. - - You can access RTAS via the special proc file system entry rtas. - Don't confuse this rtas entry with the one in /proc/device-tree/rtas - which is readonly. - - If you don't know if you can use RTAS look into - /proc/device-tree/rtas. If there are some entries, it is very likely - that you will be able to use RTAS. - - You can do cool things with rtas. To print out information about - various sensors in the system, just do a - - $ cat /proc/rtas/sensors - - or if you power off your machine at night but want it running when - you enter your office at 7:45 am, do a - - # date -d 'tomorrow 7:30' +%s > /proc/rtas/poweron - - and shutdown. - - If unsure, say Y. - config PREP_RESIDUAL bool "Support for PReP Residual Data" depends on PPC_PREP @@ -989,7 +1033,7 @@ config GENERIC_ISA_DMA bool - depends on POWER3 || POWER4 || 6xx && !8260 + depends on POWER3 || POWER4 || 6xx && !CPM2 default y config EISA @@ -1006,10 +1050,10 @@ bool config PCI - bool "PCI support" if 40x || 8260 - default y if !40x && !8260 && !8xx && !APUS && !GAMECUBE - default PCI_PERMEDIA if !4xx && !8260 && !8xx && APUS - default PCI_QSPAN if !4xx && !8260 && 8xx + bool "PCI support" if 40x || CPM2 || 85xx + default y if !40x && !CPM2 && !8xx && !APUS && !85xx && !GAMECUBE + default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS + default PCI_QSPAN if !4xx && !CPM2 && 8xx help Find out whether your system includes a PCI bus. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside @@ -1022,11 +1066,39 @@ config PCI_QSPAN bool "QSpan PCI" - depends on !4xx && !8260 && 8xx + depends on !4xx && !CPM2 && 8xx help Say Y here if you have a system based on a Motorola 8xx-series embedded processor with a QSPAN PCI interface, otherwise say N. +config PCI_8260 + bool + depends on PCI && 8260 && !8272 + default y + +config 8260_PCI9 + bool " Enable workaround for MPC826x erratum PCI 9" + depends on PCI_8260 + default y + +choice + prompt " IDMA channel for PCI 9 workaround" + depends on 8260_PCI9 + +config 8260_PCI9_IDMA1 + bool "IDMA1" + +config 8260_PCI9_IDMA2 + bool "IDMA2" + +config 8260_PCI9_IDMA3 + bool "IDMA3" + +config 8260_PCI9_IDMA4 + bool "IDMA4" + +endchoice + config PCI_PERMEDIA bool "PCI for Permedia2" depends on !4xx && !8xx && APUS @@ -1198,6 +1270,7 @@ source "lib/Kconfig" +source "arch/ppc/oprofile/Kconfig" menu "Kernel hacking" @@ -1245,7 +1318,7 @@ config KGDB bool "Include kgdb kernel debugger" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && (BROKEN || PPC_GEN550 || 4xx) select DEBUG_INFO help Include in-kernel hooks for kgdb, the Linux kernel source level @@ -1273,7 +1346,7 @@ config KGDB_CONSOLE bool "Enable serial console thru kgdb port" - depends on KGDB && 8xx || 8260 + depends on KGDB && 8xx || CPM2 help If you enable this, all serial console messages will be sent over the gdb stub. @@ -1313,11 +1386,11 @@ config SERIAL_TEXT_DEBUG bool "Support for early boot texts over serial port" - depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550 + depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550 || PPC_MPC52xx config PPC_OCP bool - depends on IBM_OCP + depends on IBM_OCP || FSL_OCP default y endmenu |
|
From: <aot...@us...> - 2004-08-15 22:33:15
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/include/linux Modified Files: fb.h Log Message: Merged 2.6.8{,.1} Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- fb.h 16 Jun 2004 17:30:46 -0000 1.5 +++ fb.h 15 Aug 2004 22:33:05 -0000 1.6 @@ -16,7 +16,11 @@ #define FBIOGETCMAP 0x4604 #define FBIOPUTCMAP 0x4605 #define FBIOPAN_DISPLAY 0x4606 +#ifdef __KERNEL__ +#define FBIO_CURSOR _IOWR('F', 0x08, struct fb_cursor_user) +#else #define FBIO_CURSOR _IOWR('F', 0x08, struct fb_cursor) +#endif /* 0x4607-0x460B are defined below */ /* #define FBIOGET_MONITORSPEC 0x460C */ /* #define FBIOPUT_MONITORSPEC 0x460D */ @@ -125,7 +129,8 @@ unsigned long mmio_start; /* Start of Memory Mapped I/O */ /* (physical address) */ __u32 mmio_len; /* Length of Memory Mapped I/O */ - __u32 accel; /* Type of acceleration available */ + __u32 accel; /* Indicate to driver which */ + /* specific chip/card we have */ __u16 reserved[3]; /* Reserved for future compatibility */ }; @@ -154,7 +159,7 @@ #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */ #define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/ -#define FB_ACCELF_TEXT 1 /* text mode acceleration */ +#define FB_ACCELF_TEXT 1 /* (OBSOLETE) see fb_info.flags and vc_mode */ #define FB_SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */ #define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */ @@ -200,7 +205,7 @@ __u32 height; /* height of picture in mm */ __u32 width; /* width of picture in mm */ - __u32 accel_flags; /* acceleration flags (hints) */ + __u32 accel_flags; /* (OBSOLETE) see fb_info.flags */ /* Timing: All values in pixclocks, except pixclock (of course) */ __u32 pixclock; /* pixel clock in ps (pico seconds) */ @@ -375,7 +380,7 @@ __u16 set; /* what to set */ __u16 enable; /* cursor on/off */ __u16 rop; /* bitop operation */ - char *mask; /* cursor mask bits */ + const char *mask; /* cursor mask bits */ struct fbcurpos hot; /* cursor hot spot */ struct fb_image image; /* Cursor image */ }; @@ -396,6 +401,36 @@ struct device; struct file; +struct fb_cmap_user { + __u32 start; /* First entry */ + __u32 len; /* Number of entries */ + __u16 __user *red; /* Red values */ + __u16 __user *green; + __u16 __user *blue; + __u16 __user *transp; /* transparency, can be NULL */ +}; + +struct fb_image_user { + __u32 dx; /* Where to place image */ + __u32 dy; + __u32 width; /* Size of image */ + __u32 height; + __u32 fg_color; /* Only used when a mono bitmap */ + __u32 bg_color; + __u8 depth; /* Depth of the image */ + const char __user *data; /* Pointer to image data */ + struct fb_cmap_user cmap; /* color map info */ +}; + +struct fb_cursor_user { + __u16 set; /* what to set */ + __u16 enable; /* cursor on/off */ + __u16 rop; /* bitop operation */ + const char __user *mask; /* cursor mask bits */ + struct fbcurpos hot; /* cursor hot spot */ + struct fb_image_user image; /* Cursor image */ +}; + /* * Register/unregister for framebuffer events */ @@ -458,8 +493,8 @@ /* For framebuffers with strange non linear layouts or that do not * work with normal memory mapped access */ - ssize_t (*fb_read)(struct file *file, char *buf, size_t count, loff_t *ppos); - ssize_t (*fb_write)(struct file *file, const char *buf, size_t count, loff_t *ppos); + ssize_t (*fb_read)(struct file *file, char __user *buf, size_t count, loff_t *ppos); + ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos); /* checks var and eventually tweaks it to something supported, * DO NOT MODIFY PAR */ @@ -502,15 +537,47 @@ int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); }; +/* FBINFO_* = fb_info.flags bit flags */ +#define FBINFO_MODULE 0x0001 /* Low-level driver is a module */ +#define FBINFO_HWACCEL_DISABLED 0x0002 + /* When FBINFO_HWACCEL_DISABLED is set: + * Hardware acceleration is turned off. Software implementations + * of required functions (copyarea(), fillrect(), and imageblit()) + * takes over; acceleration engine should be in a quiescent state */ + +/* hints */ +#define FBINFO_PARTIAL_PAN_OK 0x0040 /* otw use pan only for double-buffering */ +#define FBINFO_READS_FAST 0x0080 /* soft-copy faster than rendering */ + +/* hardware supported ops */ +/* semantics: when a bit is set, it indicates that the operation is + * accelerated by hardware. + * required functions will still work even if the bit is not set. + * optional functions may not even exist if the flag bit is not set. + */ +#define FBINFO_HWACCEL_NONE 0x0000 +#define FBINFO_HWACCEL_COPYAREA 0x0100 /* required */ +#define FBINFO_HWACCEL_FILLRECT 0x0200 /* required */ +#define FBINFO_HWACCEL_IMAGEBLIT 0x0400 /* required */ +#define FBINFO_HWACCEL_ROTATE 0x0800 /* optional */ +#define FBINFO_HWACCEL_XPAN 0x1000 /* optional */ +#define FBINFO_HWACCEL_YPAN 0x2000 /* optional */ +#define FBINFO_HWACCEL_YWRAP 0x4000 /* optional */ + +#define FBINFO_MISC_MODECHANGEUSER 0x10000 /* mode change request + from userspace */ +#define FBINFO_MISC_MODESWITCH 0x20000 /* mode switch */ +#define FBINFO_MISC_MODESWITCHLATE 0x40000 /* init hardware later */ + struct fb_info { int node; int flags; -#define FBINFO_FLAG_MODULE 1 /* Low-level driver is a module */ struct fb_var_screeninfo var; /* Current var */ struct fb_fix_screeninfo fix; /* Current fix */ struct fb_monspecs monspecs; /* Current Monitor specs */ struct fb_cursor cursor; /* Current cursor */ struct work_struct queue; /* Framebuffer event queue */ + struct timer_list cursor_timer; /* Cursor timer */ struct fb_pixmap pixmap; /* Image hardware mapper */ struct fb_pixmap sprite; /* Cursor hardware mapper */ struct fb_cmap cmap; /* Current cmap */ @@ -527,12 +594,24 @@ }; #ifdef MODULE -#define FBINFO_FLAG_DEFAULT FBINFO_FLAG_MODULE +#define FBINFO_DEFAULT FBINFO_MODULE #else -#define FBINFO_FLAG_DEFAULT 0 +#define FBINFO_DEFAULT 0 #endif // This will go away +#define FBINFO_FLAG_MODULE FBINFO_MODULE +#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT + +/* This will go away + * fbset currently hacks in FB_ACCELF_TEXT into var.accel_flags + * when it wants to turn the acceleration engine on. This is + * really a separate operation, and should be modified via sysfs. + * But for now, we leave it broken with the following define + */ +#define STUPID_ACCELF_TEXT_SHIT + +// This will go away #if defined(__sparc__) /* We map all of our framebuffers such that big-endian accesses @@ -550,7 +629,7 @@ #define fb_writeq sbus_writeq #define fb_memset sbus_memset_io -#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) #define fb_readb __raw_readb #define fb_readw __raw_readw @@ -599,10 +678,16 @@ extern int fb_prepare_logo(struct fb_info *fb_info); extern int fb_show_logo(struct fb_info *fb_info); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); -extern void fb_move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, +extern void fb_iomove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height, u32 shift_high, u32 shift_low, u32 mod); -extern void fb_move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, +extern void fb_iomove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, + u32 height); +extern void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 idx, + u32 height, u32 shift_high, u32 shift_low, u32 mod); +extern void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height); extern void fb_load_cursor_image(struct fb_info *); @@ -650,8 +735,10 @@ /* drivers/video/fbcmap.c */ extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); extern void fb_dealloc_cmap(struct fb_cmap *cmap); -extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, int fsfromto); -extern int fb_set_cmap(struct fb_cmap *cmap, int kspc, struct fb_info *fb_info); +extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to); +extern int fb_cmap_to_user(struct fb_cmap *from, struct fb_cmap_user *to); +extern int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *fb_info); +extern int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *fb_info); extern struct fb_cmap *fb_default_cmap(int len); extern void fb_invert_cmaps(void); |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/init In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/init Modified Files: main.c Log Message: Merged 2.6.8{,.1} Index: main.c =================================================================== RCS file: /cvsroot/gc-linux/linux/init/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- main.c 16 Jun 2004 17:30:46 -0000 1.8 +++ main.c 15 Aug 2004 22:33:05 -0000 1.9 @@ -43,9 +43,11 @@ #include <linux/efi.h> #include <linux/unistd.h> #include <linux/rmap.h> +#include <linux/mempolicy.h> #include <asm/io.h> #include <asm/bugs.h> +#include <asm/setup.h> /* * This is one of the first .c files built. Error out early @@ -110,6 +112,9 @@ void (*late_time_init)(void); extern void softirq_init(void); +/* Untouched command line (eg. for /proc) saved by arch-specific code. */ +char saved_command_line[COMMAND_LINE_SIZE]; + static char *execute_command; /* Setup configured maximum number of CPUs to activate */ @@ -156,8 +161,14 @@ do { int n = strlen(p->str); if (!strncmp(line, p->str, n)) { - if (!p->setup_func) { - printk(KERN_WARNING "Parameter %s is obsolete, ignored\n", p->str); + if (p->early) { + /* Already done in parse_early_param? (Needs + * exact match on param part) */ + if (line[n] == '\0' || line[n] == '=') + return 1; + } else if (!p->setup_func) { + printk(KERN_WARNING "Parameter %s is obsolete," + " ignored\n", p->str); return 1; } else if (p->setup_func(line + n)) return 1; @@ -268,6 +279,8 @@ panic_later = "Too many boot env vars at `%s'"; panic_param = param; } + if (!strncmp(param, envp_init[i], val - param)) + break; } envp_init[i] = param; } else { @@ -385,10 +398,43 @@ static void noinline rest_init(void) { kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); + numa_default_policy(); unlock_kernel(); cpu_idle(); } +/* Check for early params. */ +static int __init do_early_param(char *param, char *val) +{ + struct obs_kernel_param *p; + extern struct obs_kernel_param __setup_start, __setup_end; + + for (p = &__setup_start; p < &__setup_end; p++) { + if (p->early && strcmp(param, p->str) == 0) { + if (p->setup_func(val) != 0) + printk(KERN_WARNING + "Malformed early option '%s'\n", param); + } + } + /* We accept everything at this stage. */ + return 0; +} + +/* Arch code calls this early on, or if not, just before other parsing. */ +void __init parse_early_param(void) +{ + static __initdata int done = 0; + static __initdata char tmp_cmdline[COMMAND_LINE_SIZE]; + + if (done) + return; + + /* All fall through to do_early_param. */ + strlcpy(tmp_cmdline, saved_command_line, COMMAND_LINE_SIZE); + parse_args("early options", tmp_cmdline, NULL, 0, do_early_param); + done = 1; +} + /* * Activate the first processor. */ @@ -396,7 +442,6 @@ asmlinkage void __init start_kernel(void) { char * command_line; - extern char saved_command_line[]; extern struct kernel_param __start___param[], __stop___param[]; /* * Interrupts are still disabled. Do necessary setups, then @@ -427,6 +472,7 @@ build_all_zonelists(); page_alloc_init(); printk("Kernel command line: %s\n", saved_command_line); + parse_early_param(); parse_args("Booting kernel", command_line, __start___param, __stop___param - __start___param, &unknown_bootoption); @@ -457,8 +503,10 @@ initrd_start = 0; } #endif + vfs_caches_init_early(); mem_init(); kmem_cache_init(); + numa_policy_init(); if (late_time_init) late_time_init(); calibrate_delay(); @@ -648,6 +696,7 @@ free_initmem(); unlock_kernel(); system_state = SYSTEM_RUNNING; + numa_default_policy(); if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) printk("Warning: unable to open an initial console.\n"); @@ -672,3 +721,16 @@ panic("No init found. Try passing init= option to kernel."); } + +static int early_param_test(char *rest) +{ + printk("early_parm_test: %s\n", rest ?: "(null)"); + return rest ? 0 : -EINVAL; +} +early_param("testsetup", early_param_test); +static int early_setup_test(char *rest) +{ + printk("early_setup_test: %s\n", rest ?: "(null)"); + return 0; +} +__setup("testsetup_long", early_setup_test); |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/sound/ppc Modified Files: Kconfig Log Message: Merged 2.6.8{,.1} Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Kconfig 24 Apr 2004 18:31:45 -0000 1.3 +++ Kconfig 15 Aug 2004 22:33:05 -0000 1.4 @@ -3,9 +3,12 @@ menu "ALSA PowerMac devices" depends on SND!=n && PPC +comment "ALSA PowerMac requires I2C" + depends on SND && I2C=n + config SND_POWERMAC tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" - depends on SND + depends on SND && I2C select SND_PCM config SND_GAMECUBE |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/include/asm-ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/include/asm-ppc Modified Files: io.h ppcboot.h Log Message: Merged 2.6.8{,.1} Index: io.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- io.h 16 Jun 2004 17:30:45 -0000 1.2 +++ io.h 15 Aug 2004 22:33:05 -0000 1.3 @@ -30,6 +30,8 @@ #include <asm/mpc8xx.h> #elif defined(CONFIG_8260) #include <asm/mpc8260.h> +#elif defined(CONFIG_85xx) +#include <asm/mpc85xx.h> #elif defined(CONFIG_APUS) #define _IO_BASE 0 #define _ISA_MEM_BASE 0 @@ -138,18 +140,27 @@ : : "r" (val), "r" (port + _IO_BASE)); \ } -__do_in_asm(inb, "lbzx") __do_out_asm(outb, "stbx") #ifdef CONFIG_APUS +__do_in_asm(inb, "lbzx") __do_in_asm(inw, "lhz%U1%X1") __do_in_asm(inl, "lwz%U1%X1") __do_out_asm(outl,"stw%U0%X0") __do_out_asm(outw, "sth%U0%X0") +#elif defined (CONFIG_8260_PCI9) +/* in asm cannot be defined if PCI9 workaround is used */ +#define inb(port) in_8((u8 *)((port)+_IO_BASE)) +#define inw(port) in_le16((u16 *)((port)+_IO_BASE)) +#define inl(port) in_le32((u32 *)((port)+_IO_BASE)) +__do_out_asm(outw, "sthbrx") +__do_out_asm(outl, "stwbrx") #else +__do_in_asm(inb, "lbzx") __do_in_asm(inw, "lhbrx") __do_in_asm(inl, "lwbrx") __do_out_asm(outw, "sthbrx") __do_out_asm(outl, "stwbrx") + #endif #define inb_p(port) inb((port)) @@ -226,7 +237,7 @@ { #ifndef CONFIG_APUS if (address == 0) - return 0; + return NULL; return (void *)(address - PCI_DRAM_OFFSET + KERNELBASE); #else return (void*) mm_ptov (address); @@ -389,4 +400,9 @@ } #endif /* _PPC_IO_H */ + +#ifdef CONFIG_8260_PCI9 +#include <asm/mpc8260_pci9.h> +#endif + #endif /* __KERNEL__ */ Index: ppcboot.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/ppcboot.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ppcboot.h 25 Apr 2004 18:57:32 -0000 1.1 +++ ppcboot.h 15 Aug 2004 22:33:05 -0000 1.2 @@ -52,9 +52,12 @@ unsigned long bi_flashoffset; /* reserved area for startup monitor */ unsigned long bi_sramstart; /* start of SRAM memory */ unsigned long bi_sramsize; /* size of SRAM memory */ -#if defined(CONFIG_8xx) || defined(CONFIG_8260) +#if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx) unsigned long bi_immr_base; /* base of IMMR register */ #endif +#if defined(CONFIG_PPC_MPC52xx) + unsigned long bi_mbar_base; /* base of internal registers */ +#endif unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ unsigned long bi_ip_addr; /* IP Address */ unsigned char bi_enetaddr[6]; /* Ethernet address */ @@ -64,12 +67,16 @@ #endif unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ -#if defined(CONFIG_8260) +#if defined(CONFIG_CPM2) unsigned long bi_cpmfreq; /* CPM_CLK Freq, in MHz */ unsigned long bi_brgfreq; /* BRG_CLK Freq, in MHz */ unsigned long bi_sccfreq; /* SCC_CLK Freq, in MHz */ unsigned long bi_vco; /* VCO Out from PLL, in MHz */ #endif +#if defined(CONFIG_PPC_MPC52xx) + unsigned long bi_ipbfreq; /* IPB Bus Freq, in MHz */ + unsigned long bi_pcifreq; /* PCI Bus Freq, in MHz */ +#endif unsigned long bi_baudrate; /* Console Baudrate */ #if defined(CONFIG_405GP) unsigned char bi_s_version[4]; /* Version of this structure */ @@ -82,7 +89,7 @@ #if defined(CONFIG_HYMOD) hymod_conf_t bi_hymod_conf; /* hymod configuration information */ #endif -#if defined(CONFIG_EVB64260) +#if defined(CONFIG_EVB64260) || defined(CONFIG_85xx) /* the board has three onboard ethernet ports */ unsigned char bi_enet1addr[6]; unsigned char bi_enet2addr[6]; |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/drivers/video Modified Files: Kconfig Makefile fbmem.c Log Message: Merged 2.6.8{,.1} Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Kconfig 16 Jun 2004 17:30:44 -0000 1.7 +++ Kconfig 15 Aug 2004 22:33:04 -0000 1.8 @@ -40,7 +40,7 @@ config FB_CIRRUS tristate "Cirrus Logic support" - depends on FB && (AMIGA || PCI) && BROKEN + depends on FB && (ZORRO || PCI) ---help--- This enables support for Cirrus Logic GD542x/543x based boards on Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum. @@ -93,7 +93,7 @@ config FB_CYBER2000 tristate "CyberPro 2000/2010/5000 support" - depends on FB && PCI + depends on FB && PCI && (BROKEN || !SPARC64) help This enables support for the Integraphics CyberPro 20x0 and 5000 VGA chips used in the Rebel.com Netwinder and other machines. @@ -238,7 +238,7 @@ config FB_S3TRIO bool "S3 Trio display support" - depends on FB && PPC + depends on FB && PPC && BROKEN help If you have a S3 Trio say Y. Say N for S3 Virge. @@ -424,6 +424,8 @@ config FB_RIVA tristate "nVidia Riva support" depends on FB && PCI + select I2C_ALGOBIT if FB_RIVA_I2C + select I2C if FB_RIVA_I2C help This driver supports graphics boards with the nVidia Riva/Geforce chips. @@ -432,6 +434,27 @@ To compile this driver as a module, choose M here: the module will be called rivafb. +config FB_RIVA_I2C + bool "Enable DDC Support" + depends on FB_RIVA + help + This enables I2C support for nVidia Chipsets. This is used + only for getting EDID information from the attached display + allowing for robust video mode handling and switching. + + Because fbdev-2.6 requires that drivers must be able to + independently validate video mode parameters, you should say Y + here. + +config FB_RIVA_DEBUG + bool "Lots of debug output from Riva(nVidia) driver" + depends on FB_RIVA + default n + help + Say Y here if you want the Riva driver to output all sorts + of debugging informations to provide to the maintainer when + something goes wrong. + config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" depends on FB && AGP && AGP_INTEL && EXPERIMENTAL && PCI Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 16 Jun 2004 17:30:44 -0000 1.6 +++ Makefile 15 Aug 2004 22:33:04 -0000 1.7 @@ -39,7 +39,7 @@ obj-$(CONFIG_FB_OF) += offb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o obj-$(CONFIG_FB_IMSTT) += imsttfb.o cfbimgblt.o obj-$(CONFIG_FB_RETINAZ3) += retz3fb.o -obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o +obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o obj-$(CONFIG_FB_TRIDENT) += tridentfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o obj-$(CONFIG_FB_S3TRIO) += S3triofb.o obj-$(CONFIG_FB_TGA) += tgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o Index: fbmem.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- fbmem.c 16 Jun 2004 17:30:44 -0000 1.8 +++ fbmem.c 15 Aug 2004 22:33:04 -0000 1.9 @@ -73,8 +73,8 @@ extern int cyber2000fb_setup(char*); extern int retz3fb_init(void); extern int retz3fb_setup(char*); -extern int clgenfb_init(void); -extern int clgenfb_setup(char*); +extern int cirrusfb_init(void); +extern int cirrusfb_setup(char*); extern int hitfb_init(void); extern int vfb_init(void); extern int vfb_setup(char*); @@ -172,6 +172,7 @@ extern int kyrofb_setup(char*); extern int mc68x328fb_init(void); extern int mc68x328fb_setup(char *); +extern int asiliantfb_init(void); extern int gamecubefb_init(void); extern int gamecubefb_setup(char*); @@ -205,8 +206,8 @@ #ifdef CONFIG_FB_PM3 { "pm3fb", pm3fb_init, pm3fb_setup }, #endif -#ifdef CONFIG_FB_CLGEN - { "clgenfb", clgenfb_init, clgenfb_setup }, +#ifdef CONFIG_FB_CIRRUS + { "cirrusfb", cirrusfb_init, cirrusfb_setup }, #endif #ifdef CONFIG_FB_ATY { "atyfb", atyfb_init, atyfb_setup }, @@ -387,6 +388,9 @@ #ifdef CONFIG_FB_68328 { "68328fb", mc68x328fb_init, mc68x328fb_setup }, #endif +#ifdef CONFIG_FB_ASILIANT + { "asiliantfb", asiliantfb_init, NULL }, +#endif #ifdef CONFIG_FB_GAMECUBE { "gamecubefb", gamecubefb_init, gamecubefb_setup }, #endif @@ -431,34 +435,37 @@ /* * Drawing helpers. */ -static u8 fb_sys_inbuf(struct fb_info *info, u8 *src) +void fb_iomove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, + u32 height) { - return *src; -} + int i; -static void fb_sys_outbuf(struct fb_info *info, u8 *dst, - u8 *src, unsigned int size) -{ - memcpy(dst, src, size); -} + for (i = height; i--; ) { + buf->outbuf(info, dst, src, s_pitch); + src += s_pitch; + dst += d_pitch; + } +} -void fb_move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, - u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, - u32 height) +void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, + u32 height) { - int i; + int i, j; for (i = height; i--; ) { - buf->outbuf(info, dst, src, s_pitch); + for (j = 0; j < s_pitch; j++) + dst[j] = src[j]; src += s_pitch; dst += d_pitch; } } -void fb_move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, - u8 *dst, u32 d_pitch, u8 *src, u32 idx, - u32 height, u32 shift_high, u32 shift_low, - u32 mod) +void fb_iomove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 idx, + u32 height, u32 shift_high, u32 shift_low, + u32 mod) { u8 mask = (u8) (0xfff << shift_high), tmp; int i, j; @@ -486,6 +493,37 @@ } } +void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, + u8 *dst, u32 d_pitch, u8 *src, u32 idx, + u32 height, u32 shift_high, u32 shift_low, + u32 mod) +{ + u8 mask = (u8) (0xfff << shift_high), tmp; + int i, j; + + for (i = height; i--; ) { + for (j = 0; j < idx; j++) { + tmp = dst[j]; + tmp &= mask; + tmp |= *src >> shift_low; + dst[j] = tmp; + tmp = *src << shift_high; + dst[j+1] = tmp; + src++; + } + tmp = dst[idx]; + tmp &= mask; + tmp |= *src >> shift_low; + dst[idx] = tmp; + if (shift_high < mod) { + tmp = *src << shift_high; + dst[idx+1] = tmp; + } + src++; + dst += d_pitch; + } +} + /* * we need to lock this section since fb_cursor * may use fb_imageblit() @@ -530,7 +568,7 @@ return n < 0 ? d >> -n : d << n; } -static void __init fb_set_logocmap(struct fb_info *info, +static void fb_set_logocmap(struct fb_info *info, const struct linux_logo *logo) { struct fb_cmap palette_cmap; @@ -560,11 +598,11 @@ palette_cmap.blue[j] = clut[2] << 8 | clut[2]; clut += 3; } - fb_set_cmap(&palette_cmap, 1, info); + fb_set_cmap(&palette_cmap, info); } } -static void __init fb_set_logo_truepalette(struct fb_info *info, +static void fb_set_logo_truepalette(struct fb_info *info, const struct linux_logo *logo, u32 *palette) { @@ -594,7 +632,7 @@ } } -static void __init fb_set_logo_directpalette(struct fb_info *info, +static void fb_set_logo_directpalette(struct fb_info *info, const struct linux_logo *logo, u32 *palette) { @@ -609,7 +647,7 @@ palette[i] = i << redshift | i << greenshift | i << blueshift; } -static void __init fb_set_logo(struct fb_info *info, +static void fb_set_logo(struct fb_info *info, const struct linux_logo *logo, u8 *dst, int depth) { @@ -807,7 +845,7 @@ } static ssize_t -fb_read(struct file *file, char *buf, size_t count, loff_t *ppos) +fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { unsigned long p = *ppos; struct inode *inode = file->f_dentry->d_inode; @@ -844,7 +882,7 @@ } static ssize_t -fb_write(struct file *file, const char *buf, size_t count, loff_t *ppos) +fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { unsigned long p = *ppos; struct inode *inode = file->f_dentry->d_inode; @@ -898,53 +936,100 @@ unsigned int width = (info->cursor.image.width + 7) >> 3; u8 *data = (u8 *) info->cursor.image.data; - info->sprite.outbuf(info, info->sprite.addr, data, width); + if (info->sprite.outbuf) + info->sprite.outbuf(info, info->sprite.addr, data, width); + else + memcpy(info->sprite.addr, data, width); } int -fb_cursor(struct fb_info *info, struct fb_cursor *sprite) +fb_cursor(struct fb_info *info, struct fb_cursor_user __user *sprite) { + struct fb_cursor_user cursor_user; struct fb_cursor cursor; - int err; + char *data = NULL, *mask = NULL; + u16 *red = NULL, *green = NULL, *blue = NULL, *transp = NULL; + int err = -EINVAL; - if (copy_from_user(&cursor, sprite, sizeof(struct fb_cursor))) + if (copy_from_user(&cursor_user, sprite, sizeof(struct fb_cursor_user))) return -EFAULT; + memcpy(&cursor, &cursor_user, sizeof(cursor)); + cursor.mask = NULL; + cursor.image.data = NULL; + cursor.image.cmap.red = NULL; + cursor.image.cmap.green = NULL; + cursor.image.cmap.blue = NULL; + cursor.image.cmap.transp = NULL; + if (cursor.set & FB_CUR_SETCUR) info->cursor.enable = 1; if (cursor.set & FB_CUR_SETCMAP) { - err = fb_copy_cmap(&cursor.image.cmap, &sprite->image.cmap, 1); - if (err) - return err; + unsigned len = cursor.image.cmap.len; + if ((int)len <= 0) + goto out; + len *= 2; + err = -ENOMEM; + red = kmalloc(len, GFP_USER); + green = kmalloc(len, GFP_USER); + blue = kmalloc(len, GFP_USER); + if (!red || !green || !blue) + goto out; + if (cursor_user.image.cmap.transp) { + transp = kmalloc(len, GFP_USER); + if (!transp) + goto out; + } + err = -EFAULT; + if (copy_from_user(red, cursor_user.image.cmap.red, len)) + goto out; + if (copy_from_user(green, cursor_user.image.cmap.green, len)) + goto out; + if (copy_from_user(blue, cursor_user.image.cmap.blue, len)) + goto out; + if (transp) { + if (copy_from_user(transp, + cursor_user.image.cmap.transp, len)) + goto out; + } + cursor.image.cmap.red = red; + cursor.image.cmap.green = green; + cursor.image.cmap.blue = blue; + cursor.image.cmap.transp = transp; } if (cursor.set & FB_CUR_SETSHAPE) { int size = ((cursor.image.width + 7) >> 3) * cursor.image.height; + if ((cursor.image.height != info->cursor.image.height) || (cursor.image.width != info->cursor.image.width)) cursor.set |= FB_CUR_SETSIZE; - cursor.image.data = kmalloc(size, GFP_KERNEL); - if (!cursor.image.data) - return -ENOMEM; + err = -ENOMEM; + data = kmalloc(size, GFP_USER); + mask = kmalloc(size, GFP_USER); + if (!mask || !data) + goto out; - cursor.mask = kmalloc(size, GFP_KERNEL); - if (!cursor.mask) { - kfree(cursor.image.data); - return -ENOMEM; - } + err = -EFAULT; + if (copy_from_user(data, cursor_user.image.data, size) || + copy_from_user(mask, cursor_user.mask, size)) + goto out; - if (copy_from_user(cursor.image.data, sprite->image.data, size) || - copy_from_user(cursor.mask, sprite->mask, size)) { - kfree(cursor.image.data); - kfree(cursor.mask); - return -EFAULT; - } + cursor.image.data = data; + cursor.mask = mask; } info->cursor.set = cursor.set; info->cursor.rop = cursor.rop; err = info->fbops->fb_cursor(info, &cursor); +out: + kfree(data); + kfree(mask); + kfree(red); + kfree(green); + kfree(blue); + kfree(transp); return err; } @@ -993,9 +1078,13 @@ fb_pan_display(info, &info->var); - fb_set_cmap(&info->cmap, 1, info); + fb_set_cmap(&info->cmap, info); - notifier_call_chain(&fb_notifier_list, FB_EVENT_MODE_CHANGE, info); + if (info->flags & FBINFO_MISC_MODECHANGEUSER) { + info->flags &= ~FBINFO_MISC_MODECHANGEUSER; + notifier_call_chain(&fb_notifier_list, + FB_EVENT_MODE_CHANGE, info); + } } } return 0; @@ -1018,7 +1107,7 @@ cmap.len = info->cmap.len; } else cmap = info->cmap; - return fb_set_cmap(&cmap, 1, info); + return fb_set_cmap(&cmap, info); } static int @@ -1033,63 +1122,66 @@ #ifdef CONFIG_FRAMEBUFFER_CONSOLE struct fb_con2fbmap con2fb; #endif - struct fb_cmap cmap; + struct fb_cmap_user cmap; + void __user *argp = (void __user *)arg; int i; if (!fb) return -ENODEV; switch (cmd) { case FBIOGET_VSCREENINFO: - return copy_to_user((void *) arg, &info->var, + return copy_to_user(argp, &info->var, sizeof(var)) ? -EFAULT : 0; case FBIOPUT_VSCREENINFO: - if (copy_from_user(&var, (void *) arg, sizeof(var))) + if (copy_from_user(&var, argp, sizeof(var))) return -EFAULT; acquire_console_sem(); + info->flags |= FBINFO_MISC_MODECHANGEUSER; i = fb_set_var(info, &var); + info->flags &= ~FBINFO_MISC_MODECHANGEUSER; release_console_sem(); if (i) return i; - if (copy_to_user((void *) arg, &var, sizeof(var))) + if (copy_to_user(argp, &var, sizeof(var))) return -EFAULT; return 0; case FBIOGET_FSCREENINFO: - return copy_to_user((void *) arg, &info->fix, + return copy_to_user(argp, &info->fix, sizeof(fix)) ? -EFAULT : 0; case FBIOPUTCMAP: - if (copy_from_user(&cmap, (void *) arg, sizeof(cmap))) + if (copy_from_user(&cmap, argp, sizeof(cmap))) return -EFAULT; - return (fb_set_cmap(&cmap, 0, info)); + return (fb_set_user_cmap(&cmap, info)); case FBIOGETCMAP: - if (copy_from_user(&cmap, (void *) arg, sizeof(cmap))) + if (copy_from_user(&cmap, argp, sizeof(cmap))) return -EFAULT; - return (fb_copy_cmap(&info->cmap, &cmap, 2)); + return fb_cmap_to_user(&info->cmap, &cmap); case FBIOPAN_DISPLAY: - if (copy_from_user(&var, (void *) arg, sizeof(var))) + if (copy_from_user(&var, argp, sizeof(var))) return -EFAULT; acquire_console_sem(); i = fb_pan_display(info, &var); release_console_sem(); if (i) return i; - if (copy_to_user((void *) arg, &var, sizeof(var))) + if (copy_to_user(argp, &var, sizeof(var))) return -EFAULT; return 0; case FBIO_CURSOR: acquire_console_sem(); - i = fb_cursor(info, (struct fb_cursor *) arg); + i = fb_cursor(info, argp); release_console_sem(); return i; #ifdef CONFIG_FRAMEBUFFER_CONSOLE case FBIOGET_CON2FBMAP: - if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb))) + if (copy_from_user(&con2fb, argp, sizeof(con2fb))) return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; con2fb.framebuffer = con2fb_map[con2fb.console-1]; - return copy_to_user((void *)arg, &con2fb, + return copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0; case FBIOPUT_CON2FBMAP: - if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb))) + if (copy_from_user(&con2fb, argp, sizeof(con2fb))) return - EFAULT; if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; @@ -1101,11 +1193,10 @@ #endif /* CONFIG_KMOD */ if (!registered_fb[con2fb.framebuffer]) return -EINVAL; - if (con2fb.console != 0) - set_con2fb_map(con2fb.console-1, con2fb.framebuffer); - else - fb_console_init(); - return 0; + if (con2fb.console > 0 && con2fb.console < MAX_NR_CONSOLES) + return set_con2fb_map(con2fb.console-1, + con2fb.framebuffer); + return -EINVAL; #endif /* CONFIG_FRAMEBUFFER_CONSOLE */ case FBIOBLANK: acquire_console_sem(); @@ -1311,10 +1402,6 @@ } } fb_info->pixmap.offset = 0; - if (fb_info->pixmap.outbuf == NULL) - fb_info->pixmap.outbuf = fb_sys_outbuf; - if (fb_info->pixmap.inbuf == NULL) - fb_info->pixmap.inbuf = fb_sys_inbuf; if (fb_info->sprite.addr == NULL) { fb_info->sprite.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL); @@ -1327,10 +1414,6 @@ } } fb_info->sprite.offset = 0; - if (fb_info->sprite.outbuf == NULL) - fb_info->sprite.outbuf = fb_sys_outbuf; - if (fb_info->sprite.inbuf == NULL) - fb_info->sprite.inbuf = fb_sys_inbuf; registered_fb[i] = fb_info; @@ -1422,7 +1505,7 @@ { int i; - create_proc_read_entry("fb", 0, 0, fbmem_read_proc, NULL); + create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL); devfs_mk_dir("fb"); if (register_chrdev(FB_MAJOR,"fb",&fb_fops)) @@ -1525,8 +1608,10 @@ EXPORT_SYMBOL(fb_blank); EXPORT_SYMBOL(fb_pan_display); EXPORT_SYMBOL(fb_get_buffer_offset); -EXPORT_SYMBOL(fb_move_buf_unaligned); -EXPORT_SYMBOL(fb_move_buf_aligned); +EXPORT_SYMBOL(fb_iomove_buf_unaligned); +EXPORT_SYMBOL(fb_iomove_buf_aligned); +EXPORT_SYMBOL(fb_sysmove_buf_unaligned); +EXPORT_SYMBOL(fb_sysmove_buf_aligned); EXPORT_SYMBOL(fb_load_cursor_image); EXPORT_SYMBOL(fb_set_suspend); EXPORT_SYMBOL(fb_register_client); |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/drivers/net Modified Files: Kconfig Makefile Log Message: Merged 2.6.8{,.1} Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Kconfig 16 Jun 2004 17:30:44 -0000 1.7 +++ Kconfig 15 Aug 2004 22:33:04 -0000 1.8 @@ -240,7 +240,7 @@ config OAKNET tristate "National DP83902AV (Oak ethernet) support" - depends on NET_ETHERNET && PPC + depends on NET_ETHERNET && PPC && BROKEN select CRC32 help Say Y if your machine has this type of Ethernet network card. @@ -672,7 +672,7 @@ config ELMC tristate "3c523 \"EtherLink/MC\" support" - depends on NET_VENDOR_3COM && MCA + depends on NET_VENDOR_3COM && MCA_LEGACY help If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from @@ -819,6 +819,24 @@ <file:Documentation/networking/net-modules.txt>. The module will be called smc-ultra32. +config SMC91X + tristate "SMC 91C9x/91C1xxx support" + select CRC32 + select MII + depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6) + help + This is a driver for SMC's 91x series of Ethernet chipsets, + including the SMC91C94 and the SMC91C111. Say Y if you want it + compiled into the kernel, and read the file + <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, + available from <http://www.linuxdoc.org/docs.html#howto>. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called smc91x. If you want to compile it as a + module, say M here and read <file:Documentation/modules.txt> as well + as <file:Documentation/networking/net-modules.txt>. + config SMC9194 tristate "SMC 9194 support" depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN) @@ -889,7 +907,7 @@ config AT1700 tristate "AT1700/1720/RE1000Plus(C-Bus) support (EXPERIMENTAL)" - depends on NET_ETHERNET && (ISA || MCA) && EXPERIMENTAL + depends on NET_ETHERNET && (ISA || MCA_LEGACY) && EXPERIMENTAL select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -928,7 +946,7 @@ config NET_ISA bool "Other ISA cards" - depends on NET_ETHERNET && ISA && !X86_PC9800 + depends on NET_ETHERNET && ISA ---help--- If your network (Ethernet) card hasn't been mentioned yet and its bus system (that's the way the cards talks to the other components @@ -1111,56 +1129,6 @@ the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. -config NET_CBUS - bool "NEC PC-9800 C-bus cards" - depends on NET_ETHERNET && ISA && X86_PC9800 - ---help--- - If your network (Ethernet) card hasn't been mentioned yet and its - bus system (that's the way the cards talks to the other components - of your computer) is NEC PC-9800 C-Bus, say Y. - -config NE2K_CBUS - tristate "Most NE2000-based Ethernet support" - depends on NET_CBUS - select CRC32 - -config NE2K_CBUS_EGY98 - bool "Melco EGY-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_LGY98 - bool "Melco LGY-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_ICM - bool "ICM IF-27xxET support" - depends on NE2K_CBUS - -config NE2K_CBUS_IOLA98 - bool "I-O DATA LA-98 support" - depends on NE2K_CBUS - -config NE2K_CBUS_CNET98EL - bool "Contec C-NET(98)E/L support" - depends on NE2K_CBUS - -config NE2K_CBUS_CNET98EL_IO_BASE - hex "C-NET(98)E/L I/O base address (0xaaed or 0x55ed)" - depends on NE2K_CBUS_CNET98EL - default "0xaaed" - -config NE2K_CBUS_ATLA98 - bool "Allied Telesis LA-98 Support" - depends on NE2K_CBUS - -config NE2K_CBUS_BDN - bool "ELECOM Laneed LD-BDN[123]A Support" - depends on NE2K_CBUS - -config NE2K_CBUS_NEC108 - bool "NEC PC-9801-108 Support" - depends on NE2K_CBUS - config SKMC tristate "SKnet MCA support" depends on NET_ETHERNET && MCA && BROKEN @@ -1178,7 +1146,7 @@ config NE2_MCA tristate "NE/2 (ne2000 MCA version) support" - depends on NET_ETHERNET && MCA + depends on NET_ETHERNET && MCA_LEGACY select CRC32 help If you have a network (Ethernet) card of this type, say Y and read @@ -1293,6 +1261,19 @@ config AMD8111E_NAPI bool "Enable NAPI support" depends on AMD8111_ETH + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. It is + still somewhat experimental and thus not yet enabled by default. + + If your estimated Rx load is 10kpps or more, or if the card will be + deployed on potentially unfriendly networks (e.g. in a firewall), + then say Y here. + + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. config ADAPTEC_STARFIRE tristate "Adaptec Starfire/DuraLAN support" @@ -1320,6 +1301,11 @@ deployed on potentially unfriendly networks (e.g. in a firewall), then say Y here. + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. + config AC3200 tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)" depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL @@ -1507,6 +1493,19 @@ config E100_NAPI bool "Use Rx Polling (NAPI)" depends on E100 + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. It is + still somewhat experimental and thus not yet enabled by default. + + If your estimated Rx load is 10kpps or more, or if the card will be + deployed on potentially unfriendly networks (e.g. in a firewall), + then say Y here. + + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. config LNE390 tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" @@ -1611,9 +1610,7 @@ ---help--- This is a driver for the Fast Ethernet PCI network cards based on the RTL8139 chips. If you have one of those, say Y and read - <file:Documentation/networking/8139too.txt> as well as the - Ethernet-HOWTO, available from - <http://www.tldp.org/docs.html#howto>. + the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>. To compile this driver as a module, choose M here: the module will be called 8139too. This is recommended. @@ -1751,6 +1748,17 @@ If unsure, say Y. +config VIA_VELOCITY + tristate "VIA Velocity support" + depends on NET_PCI && PCI + select CRC32 + select MII + help + If you have a VIA "Velocity" based network card say Y here. + + To compile this driver as a module, choose M here. The module + will be called via-rhine. + config LAN_SAA9730 bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)" depends on NET_PCI && EXPERIMENTAL && MIPS @@ -1874,6 +1882,8 @@ Say Y here if you want to use the NE2000 compatible controller on the Renesas H8/300 processor. +source "drivers/net/fec_8xx/Kconfig" + endmenu # @@ -1969,6 +1979,19 @@ config E1000_NAPI bool "Use Rx Polling (NAPI)" depends on E1000 + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. It is + still somewhat experimental and thus not yet enabled by default. + + If your estimated Rx load is 10kpps or more, or if the card will be + deployed on potentially unfriendly networks (e.g. in a firewall), + then say Y here. + + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. config MYRI_SBUS tristate "MyriCOM Gigabit Ethernet support" @@ -2154,6 +2177,19 @@ config IXGB_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" depends on IXGB && EXPERIMENTAL + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. It is + still somewhat experimental and thus not yet enabled by default. + + If your estimated Rx load is 10kpps or more, or if the card will be + deployed on potentially unfriendly networks (e.g. in a firewall), + then say Y here. + + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. config S2IO tristate "S2IO 10Gbe XFrame NIC" @@ -2166,6 +2202,19 @@ config S2IO_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" depends on S2IO && EXPERIMENTAL + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. It is + still somewhat experimental and thus not yet enabled by default. + + If your estimated Rx load is 10kpps or more, or if the card will be + deployed on potentially unfriendly networks (e.g. in a firewall), + then say Y here. + + See <file:Documentation/networking/NAPI_HOWTO.txt> for more + information. + + If in doubt, say N. endmenu @@ -2362,6 +2411,7 @@ config PPP_ASYNC tristate "PPP support for async serial ports" depends on PPP + select CRC_CCITT ---help--- Say Y (or M) here if you want to be able to use PPP over standard asynchronous serial ports, such as COM1 or COM2 on a PC. If you use @@ -2553,3 +2603,4 @@ ---help--- If you want to log kernel messages over the network, enable this. See Documentation/networking/netconsole.txt for details. + Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 16 Jun 2004 17:30:44 -0000 1.7 +++ Makefile 15 Aug 2004 22:33:04 -0000 1.8 @@ -52,6 +52,7 @@ obj-$(CONFIG_SK98LIN) += sk98lin/ obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_VIA_RHINE) += via-rhine.o +obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o # @@ -79,7 +80,6 @@ obj-$(CONFIG_WD80x3) += wd.o 8390.o obj-$(CONFIG_EL2) += 3c503.o 8390.o obj-$(CONFIG_NE2000) += ne.o 8390.o -obj-$(CONFIG_NE2K_CBUS) += ne2k_cbus.o 8390.o obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o obj-$(CONFIG_HPLAN) += hp.o 8390.o obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o @@ -175,6 +175,8 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o obj-$(CONFIG_IBMVETH) += ibmveth.o obj-$(CONFIG_S2IO) += s2io.o +obj-$(CONFIG_SMC91X) += smc91x.o +obj-$(CONFIG_FEC_8XX) += fec_8xx/ obj-$(CONFIG_GAMECUBE_NET) += gc-net.o obj-$(CONFIG_ARM) += arm/ |
|
From: <aot...@us...> - 2004-08-15 22:33:14
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/drivers/block Modified Files: Kconfig Makefile Log Message: Merged 2.6.8{,.1} Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Kconfig 16 Jun 2004 17:30:43 -0000 1.5 +++ Kconfig 15 Aug 2004 22:33:04 -0000 1.6 @@ -6,7 +6,7 @@ config BLK_DEV_FD tristate "Normal floppy disk support" - depends on (!X86_PC9800 && !ARCH_S390 && !M68K && !IA64) || Q40 || (SUN3X && BROKEN) + depends on (!ARCH_S390 && !M68K && !IA64) || Q40 || (SUN3X && BROKEN) ---help--- If you want to use the floppy disk drive(s) of your PC under Linux, say Y. Information about this driver, especially important for IBM @@ -26,13 +26,6 @@ tristate "Atari floppy support" depends on ATARI -config BLK_DEV_FD98 - tristate "NEC PC-9800 floppy disk support" - depends on X86_PC9800 - ---help--- - If you want to use the floppy disk drive(s) of NEC PC-9801/PC-9821, - say Y. - config BLK_DEV_SWIM_IOP bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)" depends on MAC && EXPERIMENTAL && BROKEN @@ -40,6 +33,13 @@ Say Y here to support the SWIM (Super Woz Integrated Machine) IOP floppy controller on the Macintosh IIfx and Quadra 900/950. +config MAC_FLOPPY + tristate "Support for PowerMac floppy" + depends on PPC_PMAC && !PPC_PMAC64 + help + If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple) + floppy controller, say Y here. Most commonly found in PowerMacs. + config BLK_DEV_PS2 tristate "PS/2 ESDI hard disk support" depends on MCA && MCA_LEGACY @@ -310,14 +310,14 @@ If unsure, say N. -config BLK_DEV_CARMEL - tristate "Promise SATA SX8 (carmel) support" +config BLK_DEV_SX8 + tristate "Promise SATA SX8 support" depends on PCI ---help--- Saying Y or M here will enable support for the - Promise SATA SX8 ("carmel") controllers. + Promise SATA SX8 controllers. - Use devices /dev/carmel/$N and /dev/carmel/$Np$M. + Use devices /dev/sx8/$N and /dev/sx8/$Np$M. config BLK_DEV_RAM tristate "RAM disk support" Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 11 May 2004 17:48:35 -0000 1.5 +++ Makefile 15 Aug 2004 22:33:04 -0000 1.6 @@ -43,5 +43,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o obj-$(CONFIG_VIODASD) += viodasd.o -obj-$(CONFIG_BLK_DEV_CARMEL) += carmel.o +obj-$(CONFIG_BLK_DEV_SX8) += sx8.o |
|
From: <aot...@us...> - 2004-08-15 22:33:12
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/drivers Modified Files: Makefile Log Message: Merged 2.6.8{,.1} Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 24 Apr 2004 18:31:43 -0000 1.3 +++ Makefile 15 Aug 2004 22:33:04 -0000 1.4 @@ -42,6 +42,7 @@ obj-$(CONFIG_SERIO) += input/serio/ obj-$(CONFIG_I2O) += message/ obj-$(CONFIG_I2C) += i2c/ +obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ |
|
From: <aot...@us...> - 2004-08-15 22:33:12
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/arch/ppc/platforms Modified Files: Makefile Log Message: Merged 2.6.8{,.1} Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 16 Jun 2004 17:30:43 -0000 1.11 +++ Makefile 15 Aug 2004 22:33:03 -0000 1.12 @@ -2,13 +2,6 @@ # Makefile for the linux kernel. # -ifdef CONFIG_PPC64BRIDGE -EXTRA_AFLAGS := -Wa,-mppc64bridge -endif -ifdef CONFIG_40x -EXTRA_AFLAGS := -Wa,-m405 -endif - # Extra CFLAGS so we don't have to do relative includes CFLAGS_pmac_setup.o += -Iarch/$(ARCH)/mm @@ -26,10 +19,10 @@ obj-$(CONFIG_CPU_FREQ_PMAC) += pmac_cpufreq.o endif obj-$(CONFIG_PMAC_BACKLIGHT) += pmac_backlight.o -obj-$(CONFIG_PPC_RTAS) += error_log.o proc_rtas.o obj-$(CONFIG_PREP_RESIDUAL) += residual.o obj-$(CONFIG_ADIR) += adir_setup.o adir_pic.o adir_pci.o obj-$(CONFIG_EST8260) += est8260_setup.o +obj-$(CONFIG_PQ2ADS) += pq2ads_setup.o obj-$(CONFIG_TQM8260) += tqm8260_setup.o obj-$(CONFIG_EV64260) += ev64260_setup.o obj-$(CONFIG_GEMINI) += gemini_pci.o gemini_setup.o gemini_prom.o @@ -44,9 +37,11 @@ obj-$(CONFIG_PPLUS) += pplus.o obj-$(CONFIG_PRPMC750) += prpmc750.o obj-$(CONFIG_PRPMC800) += prpmc800.o +obj-$(CONFIG_RPX8260) += rpx8260.o obj-$(CONFIG_SANDPOINT) += sandpoint.o obj-$(CONFIG_SBC82xx) += sbc82xx.o obj-$(CONFIG_SPRUCE) += spruce.o +obj-$(CONFIG_LITE5200) += lite5200.o mpc5200.o obj-$(CONFIG_GAMECUBE) += gamecube.o gamecube_time.o obj-$(CONFIG_GAMECUBE_CONSOLE) += console.o obj-$(CONFIG_GAMECUBE_RESET_SWITCH) += gc-rsw.o |
|
From: <aot...@us...> - 2004-08-15 22:33:12
|
Update of /cvsroot/gc-linux/linux/arch/ppc/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/arch/ppc/kernel Modified Files: cputable.c Log Message: Merged 2.6.8{,.1} Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/kernel/cputable.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cputable.c 16 Jun 2004 17:30:43 -0000 1.2 +++ cputable.c 15 Aug 2004 22:33:03 -0000 1.3 @@ -34,7 +34,8 @@ extern void __setup_cpu_generic(unsigned long offset, int cpu_nr, struct cpu_spec* spec); #define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \ - !defined(CONFIG_POWER3) && !defined(CONFIG_POWER4)) + !defined(CONFIG_POWER3) && !defined(CONFIG_POWER4) && \ + !defined(CONFIG_BOOKE)) /* This table only contains "desktop" CPUs, it need to be filled with embedded * ones as well... @@ -54,7 +55,8 @@ #endif /* We need to mark all pages as being coherent if we're SMP or we - * have a 754x and an MPC107 host bridge. */ + * have a 754x and an MPC107 host bridge. + */ #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT #else @@ -271,7 +273,7 @@ CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | - CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450, + CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -282,7 +284,7 @@ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | - CPU_FTR_L3_DISABLE_NAP, + CPU_FTR_L3_DISABLE_NAP | CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -292,7 +294,8 @@ CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | - CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR, + CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | + CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -302,7 +305,8 @@ CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | - CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_HAS_HIGH_BATS, + CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_HAS_HIGH_BATS | + CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -313,7 +317,7 @@ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | - CPU_FTR_L3_DISABLE_NAP | CPU_FTR_HAS_HIGH_BATS, + CPU_FTR_L3_DISABLE_NAP | CPU_FTR_NEED_COHERENT | CPU_FTR_HAS_HIGH_BATS, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -324,18 +328,40 @@ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | - CPU_FTR_HAS_HIGH_BATS, + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x }, - { /* 7457 */ - 0xffff0000, 0x80020000, "7457", + { /* 7447/7457 Rev 1.0 */ + 0xffffffff, 0x80020100, "7447/7457", CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | - CPU_FTR_HAS_HIGH_BATS, + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT | CPU_FTR_NO_BTIC, + COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, + 32, 32, + __setup_cpu_745x + }, + { /* 7447/7457 Rev 1.1 */ + 0xffffffff, 0x80020101, "7447/7457", + CPU_FTR_COMMON | + CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | + CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | + CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT | CPU_FTR_NO_BTIC, + COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, + 32, 32, + __setup_cpu_745x + }, + { /* 7447/7457 Rev 1.2 and later */ + 0xffff0000, 0x80020000, "7447/7457", + CPU_FTR_COMMON | + CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | + CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_L3CR | + CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -346,7 +372,7 @@ CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP | CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | - CPU_FTR_HAS_HIGH_BATS, + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT, COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, 32, 32, __setup_cpu_745x @@ -359,8 +385,8 @@ 32, 32, __setup_cpu_603 }, - { /* 8280 is a G2_LE (603e core, plus some) */ - 0x7fff0000, 0x00820000, "8280", + { /* All G2_LE (603e core, plus some) have the same pvr */ + 0x7fff0000, 0x00820000, "G2_LE", CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP | CPU_FTR_HAS_HIGH_BATS, COMMON_PPC, @@ -570,6 +596,16 @@ 0, /*__setup_cpu_440 */ }, #endif /* CONFIG_44x */ +#ifdef CONFIG_E500 + { /* e500 */ + 0xffff0000, 0x80200000, "e500", + /* xxx - galak: add CPU_FTR_CAN_DOZE */ + CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB, + PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + 32, 32, + 0, /*__setup_cpu_e500 */ + }, +#endif #if !CLASSIC_PPC { /* default match */ 0x00000000, 0x00000000, "(generic PPC)", |
|
From: <he...@us...> - 2004-08-12 22:43:59
|
Update of /cvsroot/gc-linux/linux/drivers/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22713 Modified Files: gamecube_si.c Log Message: Cosmetic change. s/Gamecube/GameCube/. Index: gamecube_si.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/gamecube_si.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gamecube_si.c 20 Jul 2004 17:59:14 -0000 1.3 +++ gamecube_si.c 12 Aug 2004 22:43:47 -0000 1.4 @@ -14,7 +14,7 @@ MODULE_AUTHOR ("Steven Looman <st...@kr...>"); -MODULE_DESCRIPTION ("Nintendo Gamecube controller input driver"); +MODULE_DESCRIPTION ("Nintendo GameCube controller input driver"); MODULE_LICENSE ("GPL"); @@ -56,7 +56,7 @@ static struct resource resources = { - "Gamecube SI", + "GameCube SI", 0xCC006400, 0xCC006500, IORESOURCE_MEM|IORESOURCE_BUSY @@ -311,10 +311,10 @@ static int __init gcSiInit(void) { int i; - printk (KERN_WARNING "Gamecube SI: init\n"); + printk (KERN_WARNING "GameCube SI: init\n"); if (request_resource (&iomem_resource, &resources) < 0) { - printk (KERN_WARNING "Gamecube SI: resource busy\n"); + printk (KERN_WARNING "GameCube SI: resource busy\n"); return -EBUSY; } @@ -326,7 +326,7 @@ // probe ports port[i].id = getControllerID(i) >> 16; #ifdef GCSIDEBUG - printk (KERN_WARNING "Gamecube SI: port[%d] = 0x%x\n", i, port[i].id); + printk (KERN_WARNING "GameCube SI: port[%d] = 0x%x\n", i, port[i].id); #endif init_input_dev (&port[i].inputDev); @@ -335,13 +335,13 @@ port[i].inputDev.close = gcSiClose; port[i].inputDev.private = (unsigned int *)i; - printk (KERN_WARNING "Gamecube Si: Port %d: ", i); + printk (KERN_WARNING "GameCube SI: Port %d: ", i); switch (port[i].id) { case ID_PAD: printk (KERN_WARNING "standard pad\n"); - sprintf (port[i].name, "Gamecube standard pad"); + sprintf (port[i].name, "GameCube standard pad"); port[i].inputDev.name = port[i].name; // sprintf (port[i].phys, "gcsi/port%d", i); @@ -451,7 +451,7 @@ static void __exit gcSiExit(void) { int i; - printk (KERN_WARNING "Gamecube SI: exit\n"); + printk (KERN_WARNING "GameCube SI: exit\n"); for (i = 0; i < 4; ++i) if (port[i].id == ID_PAD || |
|
From: <he...@us...> - 2004-08-10 20:12:11
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22063/drivers/video Modified Files: gamecubefb.c Log Message: - Fixed 5/6 to 8 bits scaling for RGB components Used a fast (approximated) algorithm pointed by Masken. Thanks! Index: gamecubefb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gamecubefb.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gamecubefb.c 8 Aug 2004 23:19:57 -0000 1.9 +++ gamecubefb.c 10 Aug 2004 20:12:02 -0000 1.10 @@ -111,15 +111,15 @@ return 0x00800080; /* black, black */ } - /* - * FIXME: - * The current scaling from 5 or 6 bits to 8 bits is not correct. - */ - /* RGB565 */ - r1 = ((rgb1 >> 11) & 0x1f) << 3; - g1 = ((rgb1 >> 5) & 0x3f) << 2; - b1 = ((rgb1 >> 0) & 0x1f) << 3; + r1 = ((rgb1 >> 11) & 0x1f); + g1 = ((rgb1 >> 5) & 0x3f); + b1 = ((rgb1 >> 0) & 0x1f); + + /* fast (approximated) scaling to 8 bits, thanks to Masken */ + r1 = (r1 << 3) | (r1 >> 2); + g1 = (g1 << 2) | (g1 >> 4); + b1 = (b1 << 3) | (b1 >> 2); Y1 = clamp(16, 235, ((Yr * r1 + Yg * g1 + Yb * b1) >> RGB2YUV_SHIFT) + RGB2YUV_LUMA); @@ -130,10 +130,13 @@ g = g1; b = b1; } else { - /* RGB565 */ - r2 = ((rgb2 >> 11) & 0x1f) << 3; - g2 = ((rgb2 >> 5) & 0x3f) << 2; - b2 = ((rgb2 >> 0) & 0x1f) << 3; + /* same as we did for r1 before */ + r2 = ((rgb2 >> 11) & 0x1f); + g2 = ((rgb2 >> 5) & 0x3f); + b2 = ((rgb2 >> 0) & 0x1f); + r2 = (r2 << 3) | (r2 >> 2); + g2 = (g2 << 2) | (g2 >> 4); + b2 = (b2 << 3) | (b2 >> 2); Y2 = clamp(16, 235, ((Yr * r2 + Yg * g2 + Yb * b2) >> RGB2YUV_SHIFT) |
165 messages has been excluded from this view by a project administrator.
