vgabios: Some little geode cleanup.

[seabios.git] / src / Kconfig

diff --git a/src/Kconfig b/src/Kconfig
index b9875c8471d6a9c38d117b93264aad0dd430e0d0..8fb9a6627050b2457274bca3a2e0c936bf4a34ff 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -11,6 +11,7 @@ menu "General Features"
             Configure as a coreboot payload.
 
     config XEN
             Configure as a coreboot payload.
 
     config XEN

+        depends on !COREBOOT

         bool "Build for Xen HVM"
         default n
         help
         bool "Build for Xen HVM"
         default n
         help


@@ -45,12 +46,6 @@ menu "General Features"
         default y
         help
             Support an interactive boot menu at end of post.
         default y
         help
             Support an interactive boot menu at end of post.

-    config BOOTMENU_WAIT
-        depends on BOOTMENU
-        int "Bootmenu delay"
-        default 2500
-        help
-            Amount of time (in ms) to wait at menu before selecting normal boot.

     config BOOTSPLASH
         depends on BOOTMENU
         bool "Graphical boot splash screen"
     config BOOTSPLASH
         depends on BOOTMENU
         bool "Graphical boot splash screen"


@@ -109,15 +104,15 @@ menu "Hardware support"
     config AHCI
         depends on DRIVES
         bool "AHCI controllers"
     config AHCI
         depends on DRIVES
         bool "AHCI controllers"

-        default n
+        default y

         help
             Support for AHCI disk code.
     config VIRTIO_BLK
         depends on DRIVES && !COREBOOT
         help
             Support for AHCI disk code.
     config VIRTIO_BLK
         depends on DRIVES && !COREBOOT

-        bool "VirtIO controllers"
+        bool "virtio-blk controllers"

         default y
         help
         default y
         help

-            Support boot from virtio storage.
+            Support boot from virtio-blk storage.

     config FLOPPY
         depends on DRIVES
         bool "Floppy controller"
     config FLOPPY
         depends on DRIVES
         bool "Floppy controller"


@@ -131,14 +126,6 @@ menu "Hardware support"
         default y
         help
             Support PS2 ports (keyboard and mouse).
         default y
         help
             Support PS2 ports (keyboard and mouse).

-    config PS2_KEYBOARD_SPINUP
-        depends on PS2PORT && COREBOOT
-        int "Extra time (in ms) to allow a keyboard to initialize"
-        default 0
-        help
-            Some PS2 keyboards don't respond to commands immediately
-            after powering on.  Specify a positive value here to allow
-            additional time for the keyboard to become responsive.

 
     config USB
         bool "USB"
 
     config USB
         bool "USB"


@@ -199,21 +186,6 @@ menu "Hardware support"
         help
             Support parallel ports. This also enables int 17 parallel port calls.
 
         help
             Support parallel ports. This also enables int 17 parallel port calls.
 

-    config EXTRA_PCI_ROOTS
-        bool "Extra root buses"
-        default n
-        help
-            If the target machine has multiple independent root buses,
-            the extra buses may be specified here.
-    config PCI_ROOT1
-        depends on EXTRA_PCI_ROOTS
-        hex "Extra primary PCI root bus number"
-        default 0x00
-    config PCI_ROOT2
-        depends on EXTRA_PCI_ROOTS
-        hex "Extra secondary PCI root bus number"
-        default 0x00
-

     config USE_SMM
         depends on !COREBOOT
         bool "System Management Mode (SMM)"
     config USE_SMM
         depends on !COREBOOT
         bool "System Management Mode (SMM)"


@@ -276,17 +248,6 @@ menu "BIOS interfaces"
             Select this if option ROMs are already copied to
             0xc0000-0xf0000.  This must only be selected when using
             Bochs or QEMU versions older than 0.12.
             Select this if option ROMs are already copied to
             0xc0000-0xf0000.  This must only be selected when using
             Bochs or QEMU versions older than 0.12.

-    config OPTIONROMS_CHECKSUM
-        depends on OPTIONROMS
-        bool "Require correct checksum on option ROMs"
-        default y
-        help
-            Option ROMs are required to have correct checksums.
-            However, some option ROMs in the wild don't correctly
-            follow the specifications and have bad checksums.
-            Say N here to allow SeaBIOS to execute them anyways.
-
-            If unsure, say Y.

     config PMM
         depends on OPTIONROMS
         bool "PMM interface"
     config PMM
         depends on OPTIONROMS
         bool "PMM interface"


@@ -320,12 +281,6 @@ menu "BIOS interfaces"
         default y
         help
             Support S3 resume handler.
         default y
         help
             Support S3 resume handler.

-    config S3_RESUME_VGA_INIT
-        depends on S3_RESUME
-        bool "Run VGA rom on S3 resume"
-        default n
-        help
-            Run the vga rom during S3 resume.

 
     config VGAHOOKS
         depends on COREBOOT
 
     config VGAHOOKS
         depends on COREBOOT


@@ -369,6 +324,53 @@ menu "BIOS Tables"
             Support generation of ACPI tables.
 endmenu
 
             Support generation of ACPI tables.
 endmenu
 

+menu "VGA ROM"
+    config VGA_CIRRUS
+        bool "QEMU Cirrus CLGD 54xx VGA BIOS"
+        default n
+        help
+            Build support for Cirrus VGA emulation.
+
+    config VGA_BOCHS
+        bool "Bochs DISPI interface VGA BIOS"
+        default n
+        help
+            Build support for Bochs DISPI interface.
+
+    config VGA_GEODELX
+        bool "GeodeLX interface VGA BIOS"
+        default n
+        help
+            Build support for Geode LX vga.
+
+    config VGA_PCI
+        bool "PCI ROM Headers"
+        default y
+        help
+            Build PCI ROM headers so the vga rom can be extracted from
+            a PCI device.
+
+    config VGA_VID
+        depends on VGA_PCI
+        hex "PCI Vendor ID"
+        default 0x1013 if VGA_CIRRUS
+        default 0x1234 if VGA_BOCHS
+        default 0x1022 if VGA_GEODELX
+        default 0x0000
+        help
+            Vendor ID for the PCI ROM
+
+    config VGA_DID
+        depends on VGA_PCI
+        hex "PCI Device ID"
+        default 0x00b8 if VGA_CIRRUS
+        default 0x1111 if VGA_BOCHS
+        default 0x2081 if VGA_GEODELX
+        default 0x0000
+        help
+            Device ID for the PCI ROM
+endmenu
+

 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"
 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"


@@ -391,12 +393,4 @@ menu "Debugging"
         default 0x3f8
         help
             Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8.
         default 0x3f8
         help
             Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8.

-
-    config SCREEN_AND_DEBUG
-        depends on DEBUG_LEVEL != 0
-        bool "Show screen writes on debug ports"
-        default y
-        help
-            Send characters that SeaBIOS writes to the screen to the
-            debug ports.

 endmenu
 endmenu