X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2FKconfig;h=e6ce1177dc921cd5612c78d3d66695f25b8c97d5;hb=b94fdc819df4e3b54642fa7d817665460776ff9d;hp=70e350965456b634111553f730b878814b502dd0;hpb=3076cfb875b2a4344c87fb8e51063c4f2cbb520b;p=seabios.git

diff --git a/src/Kconfig b/src/Kconfig
index 70e3509..e6ce117 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -46,12 +46,6 @@ menu "General Features"
         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"
@@ -110,15 +104,15 @@ menu "Hardware support"
     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
-        bool "VirtIO controllers"
+        bool "virtio-blk controllers"
         default y
         help
-            Support boot from virtio storage.
+            Support boot from virtio-blk storage.
     config FLOPPY
         depends on DRIVES
         bool "Floppy controller"
@@ -132,14 +126,6 @@ menu "Hardware support"
         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"
@@ -200,17 +186,6 @@ menu "Hardware support"
         help
             Support parallel ports. This also enables int 17 parallel port calls.
 
-    config EXTRA_PCI_ROOTS
-        int "Number of extra root buses"
-        default 0
-        help
-            If the target machine has multiple independent root buses
-            set this to a positive value.  The SeaBIOS PCI probe will
-            then search for the given number of extra root buses.
-
-            Most machines do not have multiple root buses and this
-            setting should be zero.
-
     config USE_SMM
         depends on !COREBOOT
         bool "System Management Mode (SMM)"
@@ -273,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.
-    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"
@@ -317,12 +281,6 @@ menu "BIOS interfaces"
         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
@@ -366,6 +324,75 @@ menu "BIOS Tables"
             Support generation of ACPI tables.
 endmenu
 
+menu "VGA ROM"
+    choice
+        prompt "VGA Hardware Type"
+        default VGA_CIRRUS
+
+        config VGA_STANDARD_VGA
+            bool "Standard VGA"
+            help
+                Build basic VGA BIOS support.
+
+        config VGA_CIRRUS
+            bool "QEMU Cirrus CLGD 54xx VGA BIOS"
+            help
+                Build support for Cirrus VGA emulation.
+
+        config VGA_BOCHS
+            bool "Bochs DISPI interface VGA BIOS"
+            help
+                Build support for Bochs DISPI interface.
+
+        config VGA_GEODEGX2
+            bool "GeodeGX2 interface VGA BIOS"
+            help
+                Build support for Geode GX2 vga.
+
+        config VGA_GEODELX
+            bool "GeodeLX interface VGA BIOS"
+            help
+                Build support for Geode LX vga.
+    endchoice
+
+    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 OVERRIDE_PCI_ID
+        depends on VGA_PCI
+        bool "Override PCI Vendor and Device IDs"
+        help
+            Specify specific values for the PCI Vendor and Device IDs.
+
+    config VGA_VID
+        depends on VGA_PCI
+        hex
+        prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
+        default 0x1013 if VGA_CIRRUS
+        default 0x1234 if VGA_BOCHS
+        default 0x100b if VGA_GEODEGX2
+        default 0x1022 if VGA_GEODELX
+        default 0x0000
+        help
+            Vendor ID for the PCI ROM
+
+    config VGA_DID
+        depends on VGA_PCI
+        hex
+        prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
+        default 0x00b8 if VGA_CIRRUS
+        default 0x1111 if VGA_BOCHS
+        default 0x0030 if VGA_GEODEGX2
+        default 0x2081 if VGA_GEODELX
+        default 0x0000
+        help
+            Device ID for the PCI ROM
+endmenu
+
 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"
@@ -388,12 +415,4 @@ menu "Debugging"
         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