patch-2.1.109 linux/drivers/video/Config.in

• Lines: 233
• Date: Fri Jul 10 15:18:31 1998
• Orig file: v2.1.108/linux/drivers/video/Config.in
• Orig date: Wed Jun 24 22:54:07 1998

diff -u --recursive --new-file v2.1.108/linux/drivers/video/Config.in linux/drivers/video/Config.in
@@ -3,10 +3,7 @@
 #
 
 if [ "$CONFIG_FB" = "y" ]; then
-
-  mainmenu_option next_comment
-  comment 'Frame buffer devices'
-
+  define_bool CONFIG_DUMMY_CONSOLE y
   if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
     define_bool CONFIG_FB_ACORN y
   fi
@@ -51,97 +48,152 @@
   if [ "$CONFIG_HP300" = "y" ]; then
     define_bool CONFIG_FB_HP300 y
   fi
-  if [ "$CONFIG_TGA_CONSOLE" = "y" ]; then
-    define_bool CONFIG_FB_TGA y
+  # I used CONFIG_ARM here because the ARCH construct doesn't seem to work
+  # with xconfig.  --pb
+  if [ "$ARCH" = "i386" -o "$ARCH" = "alpha" -o "$ARCH" = "ppc" -o \
+       "$CONFIG_ARM" = "y" ]; then
+    tristate 'VGA chipset support (text only)' CONFIG_FB_VGA
   fi
-  if [ "$ARCH" = "i386" -o "$ARCH" = "alpha" -o "$ARCH" = "ppc" ]; then
-    bool 'VGA chipset support (text only)' CONFIG_FB_VGA
-  fi
-  if [ "$ARCH" = "i386" ]; then
-    bool 'VESA VGA graphics console' CONFIG_FB_VESA
-    define_bool CONFIG_VIDEO_SELECT y
+  if [ "$ARCH" = "alpha" ]; then
+    tristate 'TGA framebuffer support' CONFIG_FB_TGA
   fi
   if [ "$ARCH" = "i386" ]; then
+    if [ "$CONFIG_VGA_CONSOLE" != "y" ]; then
+      bool 'VESA VGA graphics console' CONFIG_FB_VESA
+      define_bool CONFIG_VIDEO_SELECT y
+    fi
     tristate 'MDA dual-headed support' CONFIG_FB_MDA
   fi
+  if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
+    bool 'PROM framebuffer' CONFIG_FB_PROM
+    bool 'SBUS and UPA framebuffers' CONFIG_FB_SBUS
+    if [ "$CONFIG_FB_SBUS" != "n" ]; then
+      if [ "$ARCH" = "sparc64" ]; then
+	bool 'Creator/Creator3D support' CONFIG_FB_CREATOR
+      fi
+      bool 'CGsix (GX,GXplus) support' CONFIG_FB_CGSIX
+    fi
+  fi
   tristate 'Virtual Frame Buffer support (ONLY FOR TESTING!)' CONFIG_FB_VIRTUAL
 
   bool 'Advanced low level driver options' CONFIG_FBCON_ADVANCED
   if [ "$CONFIG_FBCON_ADVANCED" = "y" ]; then
-    bool 'Monochrome support' CONFIG_FBCON_MFB
-    bool '2 bpp packed pixels support' CONFIG_FBCON_CFB2
-    bool '4 bpp packed pixels support' CONFIG_FBCON_CFB4
-    bool '8 bpp packed pixels support' CONFIG_FBCON_CFB8
-    bool '16 bpp packed pixels support' CONFIG_FBCON_CFB16
-    bool '24 bpp packed pixels support' CONFIG_FBCON_CFB24
-    bool '32 bpp packed pixels support' CONFIG_FBCON_CFB32
-    bool 'Amiga bitplanes support' CONFIG_FBCON_AFB
-    bool 'Amiga interleaved bitplanes support' CONFIG_FBCON_ILBM
-    bool 'Atari interleaved bitplanes (2 planes) support' CONFIG_FBCON_IPLAN2P2
-    bool 'Atari interleaved bitplanes (4 planes) support' CONFIG_FBCON_IPLAN2P4
-    bool 'Atari interleaved bitplanes (8 planes) support' CONFIG_FBCON_IPLAN2P8
-    bool 'Mac variable bpp packed pixels support' CONFIG_FBCON_MAC
-    bool 'VGA characters/attributes support' CONFIG_FBCON_VGA
+    tristate 'Monochrome support' CONFIG_FBCON_MFB
+    tristate '2 bpp packed pixels support' CONFIG_FBCON_CFB2
+    tristate '4 bpp packed pixels support' CONFIG_FBCON_CFB4
+    tristate '8 bpp packed pixels support' CONFIG_FBCON_CFB8
+    tristate '16 bpp packed pixels support' CONFIG_FBCON_CFB16
+    tristate '24 bpp packed pixels support' CONFIG_FBCON_CFB24
+    tristate '32 bpp packed pixels support' CONFIG_FBCON_CFB32
+    tristate 'Amiga bitplanes support' CONFIG_FBCON_AFB
+    tristate 'Amiga interleaved bitplanes support' CONFIG_FBCON_ILBM
+    tristate 'Atari interleaved bitplanes (2 planes) support' CONFIG_FBCON_IPLAN2P2
+    tristate 'Atari interleaved bitplanes (4 planes) support' CONFIG_FBCON_IPLAN2P4
+    tristate 'Atari interleaved bitplanes (8 planes) support' CONFIG_FBCON_IPLAN2P8
+#   tristate 'Atari interleaved bitplanes (16 planes) support' CONFIG_FBCON_IPLAN2P16
+    tristate 'Mac variable bpp packed pixels support' CONFIG_FBCON_MAC
+    tristate 'VGA characters/attributes support' CONFIG_FBCON_VGA
   else
-    if [ "$CONFIG_FB_AMIGA" = "y" -o "$CONFIG_FB_AMIGA" = "m" -o \
-	 "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATARI" = "m" -o \
-	 "$CONFIG_FB_CYBER" = "y" -o "$CONFIG_FB_CYBER" = "m" -o \
-	 "$CONFIG_FB_RETINAZ3" = "y" -o "$CONFIG_FB_RETINAZ3" = "m" -o \
-	 "$CONFIG_FB_VIRGE" = "y" -o "$CONFIG_FB_VIRGE" = "m" -o \
-	 "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_MAC" = "m" -o \
-	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+    # Guess what we need
+    if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_AMIGA" = "y" -o \
+	 "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_CYBER" = "y" -o \
+	 "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_RETINAZ3" = "y" -o \
+	 "$CONFIG_FB_VIRGE" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" ]; then
       define_bool CONFIG_FBCON_MFB y
+    else
+      if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_AMIGA" = "m" -o \
+	   "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_CYBER" = "m" -o \
+	   "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_RETINAZ3" = "m" -o \
+	   "$CONFIG_FB_VIRGE" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_MFB m
+      fi
     fi
-    if [ "$CONFIG_FB_AMIGA" = "y" -o "$CONFIG_FB_AMIGA" = "m" ]; then
-      define_bool CONFIG_FBCON_ILBM y
-      define_bool CONFIG_FBCON_AFB y
-    fi
-    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATARI" = "m" ]; then
-      define_bool CONFIG_FBCON_IPLAN2P2 y
-      define_bool CONFIG_FBCON_IPLAN2P4 y
-      define_bool CONFIG_FBCON_IPLAN2P8 y
-    fi
-    if [ "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_MAC" = "m" -o \
-	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
-      define_bool CONFIG_FBCON_MAC  y
+    if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_MAC" = "y" -o \
+	 "$CONFIG_FB_VIRTUAL" = "y" ]; then
       define_bool CONFIG_FBCON_CFB2 y
       define_bool CONFIG_FBCON_CFB4 y
-    fi
-    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATARI" = "m" -o \
-	 "$CONFIG_FB_OF" = "y" -o "$CONFIG_FB_OF" = "m" -o \
-	 "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_MAC" = "m" -o  \
-	 "$CONFIG_FB_TGA" = "y" -o "$CONFIG_FB_TGA" = "m" -o \
-	 "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VESA" = "m" -o \
-	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+    else
+      if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_MAC" = "m" -o \
+	   "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_CFB2 m
+	define_bool CONFIG_FBCON_CFB4 m
+      fi
+    fi
+    if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_ATARI" = "y" -o \
+	 "$CONFIG_FB_MAC" = "y" -o  "$CONFIG_FB_OF" = "y" -o \
+	 "$CONFIG_FB_TGA" = "y" -o "$CONFIG_FB_VESA" = "y" -o \
+	 "$CONFIG_FB_VIRTUAL" = "y" ]; then
       define_bool CONFIG_FBCON_CFB8 y
-    fi
-    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATARI" = "m" -o \
-	 "$CONFIG_FB_ATY" = "y" -o "$CONFIG_FB_ATY" = "m" -o \
-	 "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_MAC" = "m" -o \
-	 "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VESA" = "m" -o \
-	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+    else
+      if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
+	   "$CONFIG_FB_MAC" = "m" -o  "$CONFIG_FB_OF" = "m" -o \
+	   "$CONFIG_FB_TGA" = "m" -o "$CONFIG_FB_VESA" = "m" -o \
+	   "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_CFB8 m
+      fi
+    fi
+    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATY" = "y" -o \
+	 "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_VESA" = "y" -o \
+	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_TBOX" = "y" ]; then
       define_bool CONFIG_FBCON_CFB16 y
+    else
+      if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
+	   "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_VESA" = "m" -o \
+	   "$CONFIG_FB_VIRTUAL" = "m" -o "$CONFIG_FB_TBOX" = "m" ]; then
+	define_bool CONFIG_FBCON_CFB16 m
+      fi
     fi
-    if [ "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+    if [ "$CONFIG_FB_VIRTUAL" = "y" ]; then
       define_bool CONFIG_FBCON_CFB24 y
+    else
+      if [ "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_CFB24 m
+      fi
     fi
-    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATARI" = "m" -o \
-	 "$CONFIG_FB_ATY" = "y" -o "$CONFIG_FB_ATY" = "m" -o \
-	 "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VESA" = "m" -o \
-	 "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+    if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATY" = "y" -o \
+	 "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" ]; then
       define_bool CONFIG_FBCON_CFB32 y
+    else
+      if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
+	   "$CONFIG_FB_VESA" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_CFB32 m
+      fi
     fi
-    if [ "$CONFIG_FB_ACORN" != "n" ]; then
-      define_bool CONFIG_FBCON_MFB y
-      define_bool CONFIG_FBCON_CFB2 y
-      define_bool CONFIG_FBCON_CFB4 y
-      define_bool CONFIG_FBCON_CFB8 y
+    if [ "$CONFIG_FB_AMIGA" = "y" ]; then
+      define_bool CONFIG_FBCON_AFB y
+      define_bool CONFIG_FBCON_ILBM y
+    else
+      if [ "$CONFIG_FB_AMIGA" = "m" ]; then
+	define_bool CONFIG_FBCON_AFB m
+	define_bool CONFIG_FBCON_ILBM m
+      fi
     fi
-    if [ "$CONFIG_FB_VGA" = "y" -o "$CONFIG_FB_VGA" = "m" -o \
-	 "$CONFIG_FB_MDA" = "y" -o "$CONFIG_FB_MDA" = "m" ]; then
+    if [ "$CONFIG_FB_ATARI" = "y" ]; then
+      define_bool CONFIG_FBCON_IPLAN2P2 y
+      define_bool CONFIG_FBCON_IPLAN2P4 y
+      define_bool CONFIG_FBCON_IPLAN2P8 y
+#     define_bool CONFIG_FBCON_IPLAN2P16 y
+    else
+      if [ "$CONFIG_FB_ATARI" = "m" ]; then
+	define_bool CONFIG_FBCON_IPLAN2P2 m
+	define_bool CONFIG_FBCON_IPLAN2P4 m
+	define_bool CONFIG_FBCON_IPLAN2P8 m
+#	define_bool CONFIG_FBCON_IPLAN2P16 m
+      fi
+    fi
+    if [ "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" ]; then
+      define_bool CONFIG_FBCON_MAC  y
+    else
+      if [ "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	define_bool CONFIG_FBCON_MAC  m
+      fi
+    fi
+    if [ "$CONFIG_FB_MDA" = "y" -o "$CONFIG_FB_VGA" = "y" ]; then
       define_bool CONFIG_FBCON_VGA y
+    else
+      if [ "$CONFIG_FB_MDA" = "m" -o "$CONFIG_FB_VGA" = "m" ]; then
+	define_bool CONFIG_FBCON_VGA m
+      fi
     fi
   fi
-
-  endmenu
 fi