--- qemu/roms/seabios/src/Kconfig	2018/04/24 18:58:45	1.1.1.1
+++ qemu/roms/seabios/src/Kconfig	2018/04/24 19:23:55	1.1.1.2
@@ -10,6 +10,13 @@ menu "General Features"
         help
             Configure as a coreboot payload.
 
+    config XEN
+        depends on !COREBOOT
+        bool "Build for Xen HVM"
+        default n
+        help
+            Configure to be used by xen hvmloader, for a HVM guest.
+
     config THREADS
         bool "Parallelize hardware init"
         default y
@@ -22,6 +29,11 @@ menu "General Features"
         help
             Allow hardware init to run in parallel with optionrom execution.
 
+            This can reduce boot time, but can cause some timing
+            variations during option ROM code execution.  It is not
+            known if all option ROMs will behave properly with this
+            option.
+
     config RELOCATE_INIT
         bool "Copy init code to high memory"
         default y
@@ -34,18 +46,19 @@ 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"
         default y
         help
             Support showing a graphical boot splash screen.
+    config BOOTORDER
+        depends on BOOT
+        bool "Boot ordering"
+        default y
+        help
+            Support controlling of the boot order via the fw_cfg/CBFS
+            "bootorder" file.
 
     config COREBOOT_FLASH
         depends on COREBOOT
@@ -91,7 +104,7 @@ menu "Hardware support"
     config AHCI
         depends on DRIVES
         bool "AHCI controllers"
-        default n
+        default y
         help
             Support for AHCI disk code.
     config VIRTIO_BLK
@@ -173,21 +186,6 @@ menu "Hardware support"
         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)"
@@ -250,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"
@@ -294,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
@@ -359,12 +340,10 @@ menu "Debugging"
         default n
         help
             Send debugging information to serial port.
-
-    config SCREEN_AND_DEBUG
-        depends on DEBUG_LEVEL != 0
-        bool "Show screen writes on debug ports"
-        default y
+    config DEBUG_SERIAL_PORT
+        depends on DEBUG_SERIAL
+        hex "Serial port base address"
+        default 0x3f8
         help
-            Send characters that SeaBIOS writes to the screen to the
-            debug ports.
+            Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8.
 endmenu