--- qemu/roms/seabios/src/Kconfig	2018/04/24 19:23:55	1.1.1.2
+++ qemu/roms/seabios/src/Kconfig	2018/04/24 19:43:36	1.1.1.3
@@ -109,10 +109,16 @@ menu "Hardware support"
             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 VIRTIO_SCSI
+        depends on DRIVES && !COREBOOT
+        bool "virtio-scsi controllers"
+        default y
+        help
+            Support boot from virtio-scsi storage.
     config FLOPPY
         depends on DRIVES
         bool "Floppy controller"
@@ -283,7 +289,6 @@ menu "BIOS interfaces"
             Support S3 resume handler.
 
     config VGAHOOKS
-        depends on COREBOOT
         bool "Hardware specific VGA helpers"
         default y
         help
@@ -324,6 +329,8 @@ menu "BIOS Tables"
             Support generation of ACPI tables.
 endmenu
 
+source ../vgasrc/Kconfig
+
 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"
@@ -346,4 +353,21 @@ menu "Debugging"
         default 0x3f8
         help
             Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8.
+
+    config DEBUG_IO
+        depends on !COREBOOT && DEBUG_LEVEL != 0
+        bool "Special IO port debugging"
+        default y
+        help
+            Some emulators or hypervisors provide with a way to output debug
+            information by outputing strings in a special port present in the
+            IO space.
+
+    config DEBUG_IO_PORT
+        depends on DEBUG_IO
+        hex "Debug IO port address"
+        default 0x0402
+        help
+            Bochs uses the 0x0402 address by default, whereas Xen
+            makes the 0xe9 IO address available for guests use.
 endmenu