vgabios: Simplify cirrus find mode code.

[seabios.git] / src / Kconfig

diff --git a/src/Kconfig b/src/Kconfig
index 3f633747d0427f238474d38df7c2cada491c5510..427001457e27afeb9a340bc2bcc47186c6dc5452 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -104,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"
@@ -281,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
@@ -330,6 +324,8 @@ menu "BIOS Tables"
             Support generation of ACPI tables.
 endmenu
 
+source ../vgasrc/Kconfig
+
 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"
@@ -352,12 +348,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