[PATCH] fbcon: Save current display during initialization

[linux-2.6] / drivers / video / console / Kconfig

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index fadf7c5..4444bef 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
        bool "VGA text console" if EMBEDDED || !X86
-       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC && !ARCH_VERSATILE
+       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
@@ -26,6 +26,30 @@ config VGA_CONSOLE
 #         fi
 #      fi
 
+config VGACON_SOFT_SCROLLBACK
+       bool "Enable Scrollback Buffer in System RAM"
+       depends on VGA_CONSOLE
+       default n
+       help
+         The scrollback buffer of the standard VGA console is located in
+        the VGA RAM.  The size of this RAM is fixed and is quite small.
+        If you require a larger scrollback buffer, this can be placed in
+        System RAM which is dynamically allocated during intialization.
+        Placing the scrollback buffer in System RAM will slightly slow
+        down the console.
+
+        If you want this feature, say 'Y' here and enter the amount of
+        RAM to allocate for this buffer.  If unsure, say 'N'.
+
+config VGACON_SOFT_SCROLLBACK_SIZE
+       int "Scrollback Buffer Size (in KB)"
+       depends on VGACON_SOFT_SCROLLBACK
+       default "64"
+       help
+         Enter the amount of System RAM to allocate for the scrollback
+        buffer.  Each 64KB will give you approximately 16 80x25
+        screenfuls of scrollback buffer
+
 config VIDEO_SELECT
        bool "Video mode selection support"
        depends on  X86 && VGA_CONSOLE
@@ -68,7 +92,7 @@ config SGI_NEWPORT_CONSOLE
 
 config PROM_CONSOLE
        bool "PROM console"
-       depends on SPARC32 || SPARC64
+       depends on SPARC
        help
          Say Y to build a console driver for Sun machines that uses the
          terminal emulation built into their console PROMS.
@@ -101,6 +125,16 @@ config FRAMEBUFFER_CONSOLE
        help
          Low-level framebuffer-based console driver.
 
+config FRAMEBUFFER_CONSOLE_ROTATION
+       bool "Framebuffer Console Rotation"
+       depends on FRAMEBUFFER_CONSOLE
+       help
+         Enable display rotation for the framebuffer console.  This is done
+         in software and may be significantly slower than a normally oriented
+         display.  Note that the rotation is done at the console level only
+         such that other users of the framebuffer will remain normally
+         oriented.
+
 config STI_CONSOLE
         tristate "STI text console" 
         depends on PARISC
@@ -126,7 +160,7 @@ config FONTS
 config FONT_8x8
        bool "VGA 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-       default y if !SPARC32 && !SPARC64 && !FONTS
+       default y if !SPARC && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
          provided by the text console 80x50 (and higher) modes).
@@ -140,7 +174,7 @@ config FONT_8x8
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
-       default y if !SPARC32 && !SPARC64 && !FONTS
+       default y if !SPARC && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
          provided by the VGA text console 80x25 mode.
@@ -150,7 +184,7 @@ config FONT_8x16
 config FONT_6x11
        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-       default y if !SPARC32 && !SPARC64 && !FONTS && MAC
+       default y if !SPARC && !FONTS && MAC
        help
          Small console font with Macintosh-style high-half glyphs.  Some Mac
          framebuffer drivers don't support this one at all.
@@ -166,7 +200,7 @@ config FONT_7x14
 config FONT_PEARL_8x8
        bool "Pearl (old m68k) console 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE
-       default y if !SPARC32 && !SPARC64 && !FONTS && AMIGA
+       default y if !SPARC && !FONTS && AMIGA
        help
          Small console font with PC-style control-character and high-half
          glyphs.
@@ -174,24 +208,24 @@ config FONT_PEARL_8x8
 config FONT_ACORN_8x8
        bool "Acorn console 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE
-       default y if !SPARC32 && !SPARC64 && !FONTS && ARM && ARCH_ACORN
+       default y if !SPARC && !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 && FONTS
+       depends on !SPARC && FONTS
 
 config FONT_SUN8x16
        bool "Sparc console 8x16 font"
-       depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+       depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
        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 FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+       depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
        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
@@ -205,12 +239,5 @@ config FONT_10x18
          big letters. It fits between the sun 12x22 and the normal 8x16 font.
          If other fonts are too big or too small for you, say Y, otherwise say N.
 
-config FONT_RL
-       bool "console Roman Large 8x16 font" if FONTS
-       depends on FRAMEBUFFER_CONSOLE
-       help
-         This is the visually-appealing "RL" console font that is
-         included with the kbd package.
-
 endmenu