Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/video Kconfig,1.1,1.2 Makefile,1.51,1.52
|
From: James S. <jsi...@us...> - 2002-11-23 00:55:54
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video In directory sc8-pr-cvs1:/tmp/cvs-serv1514/linux/drivers/video Modified Files: Kconfig Makefile Log Message: Synced to 2.5.49 console BK tree. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Kconfig 1 Nov 2002 23:51:13 -0000 1.1 +++ Kconfig 23 Nov 2002 00:55:51 -0000 1.2 @@ -2,10 +2,10 @@ # Video configuration # -menu "Graphics support" +menu "Frame-buffer support" config FB - bool "Support for frame buffer devices" + bool "Support for frame buffer devices (EXPERIMENTAL)" ---help--- The frame buffer device provides an abstraction for the graphics hardware. It represents the frame buffer of some video hardware and @@ -38,9 +38,14 @@ (e.g. an accelerated X server) and that are not frame buffer device-aware may cause unexpected results. If unsure, say N. +config DUMMY_CONSOLE + bool + depends on FB + default y + config FB_CLGEN - tristate "Cirrus Logic support" - depends on FB && (AMIGA || PCI) + tristate "Cirrus Logic support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && (AMIGA || PCI) ---help--- This enables support for Cirrus Logic GD542x/543x based boards on Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum. @@ -54,8 +59,8 @@ before you next recompile the kernel. config FB_PM2 - tristate "Permedia2 support" - depends on FB && (AMIGA || PCI) + tristate "Permedia2 support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && (AMIGA || PCI) help This is the frame buffer device driver for the Permedia2 AGP frame buffer card from ASK, aka `Graphic Blaster Exxtreme'. There is a @@ -201,8 +206,8 @@ Cybervision 64 3D card, as they use incompatible video chips. config FB_VIRGE - bool "Amiga CyberVision3D support " - depends on FB && ZORRO + bool "Amiga CyberVision3D support (EXPERIMENTAL)" + depends on FB && ZORRO && EXPERIMENTAL help This enables support for the Cybervision 64/3D graphics card from Phase5. Please note that its use is not all that intuitive (i.e. if @@ -212,16 +217,16 @@ Cybervision 64 card, as they use incompatible video chips. config FB_RETINAZ3 - tristate "Amiga RetinaZ3 support" - depends on FB && ZORRO + tristate "Amiga RetinaZ3 support (EXPERIMENTAL)" + depends on FB && ZORRO && EXPERIMENTAL help This enables support for the Retina Z3 graphics card. Say N unless you have a Retina Z3 or plan to get one before you next recompile the kernel. config FB_FM2 - bool "Amiga FrameMaster II/Rainbow II support" - depends on FB && ZORRO + bool "Amiga FrameMaster II/Rainbow II support (EXPERIMENTAL)" + depends on FB && ZORRO && EXPERIMENTAL help This is the frame buffer device driver for the Amiga FrameMaster card from BSC (exhibited 1992 but not shipped as a CBM product). @@ -234,7 +239,7 @@ chipset found in Ataris. config FB_ATY - tristate "ATI Mach64 display support" if PCI + tristate "ATI Mach64 display support (EXPERIMENTAL)" if EXPERIMENTAL && PCI depends on FB help This driver supports graphics boards with the ATI Mach64 chips. @@ -250,7 +255,7 @@ depends on FB && (SPARC64 && PCI && FB_PCI || ATARI) config FB_ATY_GX - bool "Mach64 GX support" if PCI + bool "Mach64 GX support (EXPERIMENTAL)" if EXPERIMENTAL && PCI depends on FB_ATY default y if ATARI help @@ -297,7 +302,7 @@ config FB_IMSTT bool "IMS Twin Turbo display support" - depends on FB && PCI + depends on FB && PPC help The IMS Twin Turbo is a PCI-based frame buffer card bundled with many Macintosh and compatible computers. @@ -345,9 +350,8 @@ console or the IODC BIOS. config FB_MAC - bool + bool "Generic Macintosh display support" depends on FB && MAC - default y # bool ' Apple DAFB display support' CONFIG_FB_DAFB config FB_HP300 @@ -372,7 +376,7 @@ read <file:Documentation/fb/vesafb.txt>. If unsure, say Y. config FB_HGA - tristate "Hercules mono graphics console" + tristate "Hercules mono graphics console (EXPERIMENTAL)" depends on FB && X86 help Say Y here if you have a Hercules mono graphics card. @@ -482,8 +486,8 @@ discussion. config FB_RIVA - tristate "nVidia Riva support" - depends on FB && PCI + tristate "nVidia Riva support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This driver supports graphics boards with the nVidia Riva/Geforce chips. @@ -495,8 +499,8 @@ module, say M here and read <file:Documentation/modules.txt>. config FB_MATROX - tristate "Matrox acceleration" - depends on FB && PCI + tristate "Matrox acceleration (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI ---help--- Say Y here if you have a Matrox Millennium, Matrox Millennium II, Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox @@ -651,7 +655,7 @@ only one Matrox card in the box. config FB_ATY_CT - bool "Mach64 CT/VT/GT/LT (incl. 3D RAGE) support" + bool "Mach64 CT/VT/GT/LT (incl. 3D RAGE) support" if EXPERIMENTAL depends on PCI && FB_ATY default y if SPARC64 && FB_PCI help @@ -661,8 +665,8 @@ is at <http://support.ati.com/products/pc/mach64/>. config FB_RADEON - tristate "ATI Radeon display support" - depends on FB && PCI + tristate "ATI Radeon display support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You @@ -671,8 +675,8 @@ <http://www.ati.com/na/pages/products/pc/radeon32/index.html>. config FB_ATY128 - tristate "ATI Rage128 display support" - depends on FB && PCI + tristate "ATI Rage128 display support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This driver supports graphics boards with the ATI Rage128 chips. Say Y if you have such a graphics board and read @@ -684,8 +688,8 @@ module, say M here and read <file:Documentation/modules.txt>. config FB_SIS - tristate "SIS acceleration" - depends on FB && PCI + tristate "SIS acceleration (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This is the frame buffer device driver for the SiS 630 and 640 Super Socket 7 UMA cards. Specs available at <http://www.sis.com.tw/>. @@ -706,8 +710,8 @@ card. Specs available at <http://www.sis.com.tw/>. config FB_NEOMAGIC - tristate "NeoMagic display support" - depends on FB && PCI + tristate "NeoMagic display support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This driver supports notebooks with NeoMagic PCI chips. Say Y if you have such a graphics card. @@ -718,8 +722,8 @@ module, say M here and read Documentation/modules.txt. config FB_3DFX - tristate "3Dfx Banshee/Voodoo3 display support" - depends on FB && PCI + tristate "3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 chips. Say Y if you have such a graphics board. @@ -730,8 +734,8 @@ module, say M here and read <file:Documentation/modules.txt>. config FB_VOODOO1 - tristate "3Dfx Voodoo Graphics (sst1) support" - depends on FB && PCI + tristate "3Dfx Voodoo Graphics (sst1) support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI ---help--- Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or Voodoo2 (cvg) based graphics card. @@ -747,8 +751,8 @@ options and other important info support. config FB_TRIDENT - tristate "Trident support" - depends on FB && PCI + tristate "Trident support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI ---help--- This driver is supposed to support graphics boards with the Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops @@ -763,8 +767,8 @@ module, say M here and read <file:Documentation/modules.txt>. config FB_PM3 - tristate "Permedia3 support" - depends on FB && PCI + tristate "Permedia3 support (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL && PCI help This is the frame buffer device driver for the 3DLabs Permedia3 chipset, used in Formac ProFormance III, 3DLabs Oxygen VX1 & @@ -864,8 +868,8 @@ Say Y here to enable kernel support for the on-board framebuffer. config FB_VIRTUAL - tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" - depends on FB + tristate "Virtual Frame Buffer support (ONLY FOR TESTING!) (EXPERIMENTAL)" + depends on FB && EXPERIMENTAL ---help--- This is a `virtual' frame buffer device. It operates on a chunk of unswappable kernel memory instead of on the memory of a graphics @@ -883,7 +887,262 @@ If unsure, say N. -source "drivers/video/console/Kconfig" +config FBCON_ADVANCED + bool "Advanced low level driver options" + depends on FB + ---help--- + The frame buffer console uses character drawing routines that are + tailored to the specific organization of pixels in the memory of + your graphics hardware. These are called the low level frame buffer + console drivers. Note that they are used for text console output + only; they are NOT needed for graphical applications. + + If you say N here, the needed low level drivers are automatically + enabled, depending on what frame buffer devices you selected above. + This is recommended for most users. + + If you say Y here, you have more fine-grained control over which low + level drivers are enabled. You can e.g. leave out low level drivers + for color depths you do not intend to use for text consoles. + + Low level frame buffer console drivers can be modules ( = code which + can be inserted and removed from the running kernel whenever you + want). The modules will be called fbcon-*.o. If you want to compile + (some of) them as modules, read <file:Documentation/modules.txt>. + + If unsure, say N. + +config FBCON_MFB + tristate "Monochrome support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && !FB_ACORN && FB_AMIGA!=y && !FB_ATARI && FB_CYBER!=y && !FB_BWTWO && FB_RETINAZ3!=y && !FB_VIRGE && FB_CLGEN!=y && (FB_AMIGA=m || FB_CYBER=m || FB_RETINAZ3=m || FB_CLGEN=m) + default y if !FBCON_ADVANCED && (FB_ACORN || FB_AMIGA=y || FB_ATARI || FB_CYBER=y || FB_BWTWO || FB_RETINAZ3=y || FB_VIRGE || FB_CLGEN=y) + help + This is the low level frame buffer console driver for monochrome + (2 colors) packed pixels. + +config FBCON_CFB2 + tristate "2 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default y if !FBCON_ADVANCED && (FB_ACORN || FB_SA1100) + help + This is the low level frame buffer console driver for 2 bits per + pixel (4 colors) packed pixels. + +config FBCON_CFB4 + tristate "4 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default y if !FBCON_ADVANCED && (FB_ACORN || FB_SA1100) + help + This is the low level frame buffer console driver for 4 bits per + pixel (16 colors) packed pixels. + +config FBCON_CFB8 + tristate "8 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && !FB_ACORN && !FB_ATARI && !FB_P9100 && FB_CYBER2000!=y && FB_RADEON!=y && FB_TGA!=y && FB_SIS!=y && FB_PM3!=y && !FB_TCX && !FB_CGTHREE && !FB_CONTROL && FB_CLGEN!=y && !FB_CGFOURTEEN && FB_TRIDENT!=y && !FB_VIRGE && FB_CYBER!=y && !FB_VALKYRIE && !FB_PLATINUM && !FB_IGA && FB_MATROX!=y && !FB_CT65550 && FB_PM2!=y && !FB_SA1100 && (FB_CYBER2000=m || FB_RADEON=m || FB_TGA=m || FB_SIS=m || FB_PM3=m || FB_CLGEN=m || FB_TRIDENT=m || FB_CYBER=m || FB_MATROX=m || FB_PM2=m) + default y if !FBCON_ADVANCED && (FB_ACORN || FB_ATARI || FB_P9100 || FB_CYBER2000=y || FB_RADEON=y || FB_TGA=y || FB_SIS=y || FB_PM3=y || FB_TCX || FB_CGTHREE || FB_CONTROL || FB_CLGEN=y || FB_CGFOURTEEN || FB_TRIDENT=y || FB_VIRGE || FB_CYBER=y || FB_VALKYRIE || FB_PLATINUM || FB_IGA || FB_MATROX=y || FB_CT65550 || FB_PM2=y || FB_SA1100) + help + This is the low level frame buffer console driver for 8 bits per + pixel (256 colors) packed pixels. + +config FBCON_CFB16 + tristate "16 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && !FB_ATARI && FB_PM3!=y && FB_SIS!=y && FB_PVR2!=y && FB_TRIDENT!=y && !FB_TBOX && FB_VOODOO1!=y && FB_RADEON!=y && !FB_CONTROL && FB_CLGEN!=y && !FB_VIRGE && FB_CYBER!=y && !FB_VALKYRIE && !FB_PLATINUM && !FB_CT65550 && FB_MATROX!=y && FB_PM2!=y && FB_CYBER2000!=y && !FB_SA1100 && (FB_SIS=m || FB_RADEON=m || FB_PVR2=m || FB_TRIDENT=m || FB_VOODOO1=m || FB_PM3=m || FB_CLGEN=m || FB_CYBER=m || FB_MATROX=m || FB_PM2=m || FB_CYBER2000=m || FB_SA1100) + default y if !FBCON_ADVANCED && (FB_ATARI || FB_PM3=y || FB_SIS=y || FB_PVR2=y || FB_TRIDENT=y || FB_TBOX || FB_VOODOO1=y || FB_RADEON=y || FB_CONTROL || FB_CLGEN=y || FB_VIRGE || FB_CYBER=y || FB_VALKYRIE || FB_PLATINUM || FB_CT65550 || FB_MATROX=y || FB_PM2=y || FB_CYBER2000=y || FB_SA1100) + help + This is the low level frame buffer console driver for 15 or 16 bits + per pixel (32K or 64K colors, also known as `hicolor') packed + pixels. + +config FBCON_CFB24 + tristate "24 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_ATY!=y && FB_VIRTUAL!=y && FB_CLGEN!=y && !FB_VESA && FB_MATROX!=y && FB_PM2!=y && FB_ATY128!=y && FB_RADEON!=y && FB_CYBER2000!=y && FB_PVR2!=y && FB_VOODOO1!=y && FB_NEOMAGIC!=y && (FB_ATY=m || FB_VIRTUAL=m || FB_CLGEN=m || FB_MATROX=m || FB_PM2=m || FB_ATY128=m || FB_RADEON=m || FB_CYBER2000=m || FB_PVR2=m || FB_VOODOO1=m || FB_NEOMAGIC=y) + default y if !FBCON_ADVANCED && (FB_ATY=y || FB_VIRTUAL=y || FB_CLGEN=y || FB_VESA || FB_MATROX=y || FB_PM2=y || FB_ATY128=y || FB_RADEON=y || FB_CYBER2000=y || FB_PVR2=y || FB_VOODOO1=y || FB_NEOMAGIC=y) + help + This is the low level frame buffer console driver for 24 bits per + pixel (16M colors, also known as `truecolor') packed pixels. It is + NOT for `sparse' 32 bits per pixel mode. + +config FBCON_CFB32 + tristate "32 bpp packed pixels support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && !FB_ATARI && FB_RADEON!=y && FB_VOODOO1!=y && FB_TRIDENT!=y && !FB_CONTROL && FB_CLGEN!=y && FB_TGA!=y && !FB_PLATINUM && FB_MATROX!=y && FB_PM2!=y && FB_PVR2!=y && FB_PM3!=y && FB_SIS!=y && (FB_RADEON=m || FB_VOODOO1=m || FB_TRIDENT=m || FB_CLGEN=m || FB_TGA=m || FB_MATROX=m || FB_PM2=m || FB_SIS=m || FB_PVR2=m || FB_PM3=m) + default y if !FBCON_ADVANCED && (FB_ATARI || FB_RADEON=y || FB_VOODOO1=y || FB_TRIDENT=y || FB_CONTROL || FB_CLGEN=y || FB_TGA=y || FB_PLATINUM || FB_MATROX=y || FB_PM2=y || FB_PVR2=y || FB_PM3=y || FB_SIS=y) + help + This is the low level frame buffer console driver for 32 bits per + pixel (16M colors, also known as `truecolor') sparse packed pixels. + +config FBCON_ACCEL + tristate "Hardware acceleration support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_NEOMAGIC!=y && !FB_VESA && !FB_FM2 && FB_HIT!=y && !FB_HP300 && !FB_Q40 && !FB_ANAKIN && !FB_G364 && FB_VIRTUAL!=y && !FB_CLPS711X && !FB_PMAG_BA && !FB_PMAGB_B && FB_3DFX!=y && !FB_TX3912 && !FB_MAXINE && !FB_APOLLO && FB_ATY!=y && !FB_MAC && FB_RIVA!=y && !FB_OF && FB_SGIVW!=y && (FB_NEOMAGIC=m || FB_HIT=m || FB_VIRTUAL=m || FB_3DFX=m || FB_RIVA=m || FB_SGIVW=m) + default y if !FBCON_ADVANCED && (FB_NEOMAGIC=y || FB_VESA || FB_FM2 || FB_HIT=y || FB_HP300 || FB_Q40 || FB_ANAKIN || FB_G364 || FB_VIRTUAL=y || FB_CLPS711X || FB_PMAG_BA || FB_PMAGB_B || FB_3DFX=y || FB_TX3912 || FB_MAXINE || FB_APOLLO || FB_ATY=y || FB_MAC || FB_RIVA=y || FB_OF || FB_SGIVW=y) + +config FBCON_AFB + tristate "Amiga bitplanes support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_AMIGA=m + default y if !FBCON_ADVANCED && FB_AMIGA=y + help + This is the low level frame buffer console driver for 1 to 8 + bitplanes (2 to 256 colors) on Amiga. + +config FBCON_ILBM + tristate "Amiga interleaved bitplanes support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_AMIGA=m + default y if !FBCON_ADVANCED && FB_AMIGA=y + help + This is the low level frame buffer console driver for 1 to 8 + interleaved bitplanes (2 to 256 colors) on Amiga. + +config FBCON_IPLAN2P2 + tristate "Atari interleaved bitplanes (2 planes) support" if FBCON_ADVANCED + depends on FB + default y if !FBCON_ADVANCED && FB_ATARI + help + This is the low level frame buffer console driver for 2 interleaved + bitplanes (4 colors) on Atari. + +config FBCON_IPLAN2P4 + tristate "Atari interleaved bitplanes (4 planes) support" if FBCON_ADVANCED + depends on FB + default y if !FBCON_ADVANCED && FB_ATARI + help + This is the low level frame buffer console driver for 4 interleaved + bitplanes (16 colors) on Atari. + +config FBCON_IPLAN2P8 + tristate "Atari interleaved bitplanes (8 planes) support" if FBCON_ADVANCED + depends on FB + default y if !FBCON_ADVANCED && FB_ATARI + help + This is the low level frame buffer console driver for 8 interleaved + bitplanes (256 colors) on Atari. + +# tristate ' Atari interleaved bitplanes (16 planes) support' CONFIG_FBCON_IPLAN2P16 +config FBCON_VGA_PLANES + tristate "VGA 16-color planar support" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_VGA16=m + default y if !FBCON_ADVANCED && FB_VGA16=y + help + This low level frame buffer console driver enable the kernel to use + the 16-color planar modes of the old VGA cards where the bits of + each pixel are separated into 4 planes. + + Only answer Y here if you have a (very old) VGA card that isn't VESA + 2 compatible. + +config FBCON_HGA + tristate "HGA monochrome support (EXPERIMENTAL)" if FBCON_ADVANCED + depends on FB + default m if !FBCON_ADVANCED && FB_HGA=m + default y if !FBCON_ADVANCED && FB_HGA=y + help + This is the low level frame buffer console driver for Hercules mono + graphics cards. + +# Guess what we need +config FBCON_STI + tristate + depends on !FBCON_ADVANCED && FB_STI + default y + +config FBCON_FONTWIDTH8_ONLY + bool "Support only 8 pixels wide fonts" + depends on FB + help + Answer Y here will make the kernel provide only the 8x8 fonts (these + are the less readable). + + If unsure, say N. + +config FONT_SUN8x16 + bool "Sparc console 8x16 font" + depends on FB && (!SPARC32 && !SPARC64 && FBCON_FONTS || SPARC32 || SPARC64) + help + This is the high resolution console font for Sun machines. Say Y. + +config FONT_SUN12x22 + bool "Sparc console 12x22 font (not supported by all drivers)" + depends on FB && !FBCON_FONTWIDTH8_ONLY && (!SPARC32 && !SPARC64 && FBCON_FONTS || SPARC32 || SPARC64) + help + This is the high resolution console font for Sun machines with very + big letters (like the letters used in the SPARC PROM). If the + standard font is unreadable for you, say Y, otherwise say N. + +config FBCON_FONTS + bool "Select other fonts" if SPARC32 || SPARC64 + depends on FB + help + Say Y here if you would like to use fonts other than the default + your frame buffer console usually use. + + Note that the answer to this question won't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about foreign fonts. + + If unsure, say N (the default choices are safe). + +config FBCON_FONTS + prompt "Select compiled-in fonts" + depends on FB && !SPARC32 && !SPARC64 + +config FONT_8x8 + bool "VGA 8x8 font" if FBCON_FONTS + depends on FB + default y if !SPARC32 && !SPARC64 && !FBCON_FONTS + help + This is the "high resolution" font for the VGA frame buffer (the one + provided by the text console 80x50 (and higher) modes). + + Note that this is a poor quality font. The VGA 8x16 font is quite a + lot more readable. + + Given the resolution provided by the frame buffer device, answer N + here is safe. + +config FONT_8x16 + bool "VGA 8x16 font" if FBCON_FONTS + depends on FB + default y if !SPARC32 && !SPARC64 && !FBCON_FONTS + help + This is the "high resolution" font for the VGA frame buffer (the one + provided by the VGA text console 80x25 mode. + + If unsure, say Y. + +config FONT_6x11 + bool "Mac console 6x11 font (not supported by all drivers)" if FBCON_FONTS + depends on FB && !FBCON_FONTWIDTH8_ONLY + default y if !SPARC32 && !SPARC64 && !FBCON_FONTS && MAC + help + Small console font with Macintosh-style high-half glyphs. Some Mac + framebuffer drivers don't support this one at all. + +config FONT_PEARL_8x8 + bool "Pearl (old m68k) console 8x8 font" if FBCON_FONTS + depends on FB + default y if !SPARC32 && !SPARC64 && !FBCON_FONTS && AMIGA + help + Small console font with PC-style control-character and high-half + glyphs. + +config FONT_ACORN_8x8 + bool "Acorn console 8x8 font" if FBCON_FONTS + depends on FB + default y if !SPARC32 && !SPARC64 && !FBCON_FONTS && ARM && ARCH_ACORN + help + Small console font with PC-style control characters and high-half + glyphs. + +config FONT_MINI_4x6 + bool "Mini 4x6 font" + depends on !SPARC32 && !SPARC64 && FBCON_FONTS endmenu Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Makefile 1 Nov 2002 23:43:02 -0000 1.51 +++ Makefile 23 Nov 2002 00:55:51 -0000 1.52 @@ -5,15 +5,33 @@ # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. -export-objs := fbmem.o fbcmap.o fbgen.o fbmon.o modedb.o cfbfillrect.o \ - cfbcopyarea.o cfbimgblt.o cyber2000fb.o +export-objs := fbmem.o fbcmap.o fbcon.o fbmon.o modedb.o \ + fbcon-afb.o fbcon-ilbm.o fbcon-accel.o cyber2000fb.o \ + fbcon-iplan2p2.o fbcon-iplan2p4.o fbgen.o \ + fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \ + fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \ + fbcon-cfb8.o fbcon-mfb.o fbcon-hga.o # Each configuration option enables a list of files. -obj-$(CONFIG_VT) += console/ +obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o +obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o +obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o +obj-$(CONFIG_STI_CONSOLE) += sticon.o sticon-bmode.o sticore.o +obj-$(CONFIG_VGA_CONSOLE) += vgacon.o +obj-$(CONFIG_MDA_CONSOLE) += mdacon.o + +obj-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o +obj-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o +obj-$(CONFIG_FONT_8x8) += font_8x8.o +obj-$(CONFIG_FONT_8x16) += font_8x16.o +obj-$(CONFIG_FONT_6x11) += font_6x11.o +obj-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o +obj-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o +obj-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x -obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbgen.o +obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o # Only include macmodes.o if we have FB support and are PPC ifeq ($(CONFIG_FB),y) obj-$(CONFIG_PPC) += macmodes.o @@ -62,7 +80,7 @@ obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o -obj-$(CONFIG_FB_STI) += stifb.o console/sticore.o +obj-$(CONFIG_FB_STI) += stifb.o sticore.o obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o @@ -82,6 +100,24 @@ obj-$(CONFIG_FB_E1355) += epson1355fb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o + +# Generic Low Level Drivers + +obj-$(CONFIG_FBCON_AFB) += fbcon-afb.o +obj-$(CONFIG_FBCON_CFB2) += fbcon-cfb2.o +obj-$(CONFIG_FBCON_CFB4) += fbcon-cfb4.o +obj-$(CONFIG_FBCON_CFB8) += fbcon-cfb8.o +obj-$(CONFIG_FBCON_CFB16) += fbcon-cfb16.o +obj-$(CONFIG_FBCON_CFB24) += fbcon-cfb24.o +obj-$(CONFIG_FBCON_CFB32) += fbcon-cfb32.o +obj-$(CONFIG_FBCON_ILBM) += fbcon-ilbm.o +obj-$(CONFIG_FBCON_IPLAN2P2) += fbcon-iplan2p2.o +obj-$(CONFIG_FBCON_IPLAN2P4) += fbcon-iplan2p4.o +obj-$(CONFIG_FBCON_IPLAN2P8) += fbcon-iplan2p8.o +obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o +obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o +obj-$(CONFIG_FBCON_STI) += fbcon-sti.o +obj-$(CONFIG_FBCON_ACCEL) += fbcon-accel.o # Files generated that shall be removed upon make clean clean-files := promcon_tbl.c |
