aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-01-17 13:53:14 +0000
committerIan Campbell <ian.campbell@citrix.com>2013-01-17 13:53:14 +0000
commitf8079d5208755a9fa35aac4047af150a81420b78 (patch)
treed621bcea8416eb9752b3669a4ca58e0257caf0a9
parent3a43d9b747adecd94802fdc57fdfd760bf853651 (diff)
downloadxen-f8079d5208755a9fa35aac4047af150a81420b78.tar.gz
xen-f8079d5208755a9fa35aac4047af150a81420b78.tar.bz2
xen-f8079d5208755a9fa35aac4047af150a81420b78.zip
tools: Update to SeaBIOS 1.7.1
Only lightly tested with a Linux HVM guest PXE boot. Accept the defaults for the config options. Many of them are not relevant to Xen but this matches what others (at least the Debian SeaBIOS packages and the binary shipped by Qemu) are doing. The Debian Xen packages are built against Debian's SeaBIOS package so there is value in being similar. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r--Config.mk6
-rw-r--r--tools/firmware/seabios-config21
2 files changed, 22 insertions, 5 deletions
diff --git a/Config.mk b/Config.mk
index ca530e2626..5b7b2e273f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -209,9 +209,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
endif
OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871
QEMU_UPSTREAM_REVISION ?= master
-SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2
-# Sun Mar 11 09:27:07 2012 -0400
-# Update version to 1.6.3.2
+SEABIOS_UPSTREAM_TAG ?= rel-1.7.1
+# Wed Aug 29 21:27:37 2012 -0400
+# Make iasl option check work with older versions of iasl.
ETHERBOOT_NICS ?= rtl8139 8086100e
diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
index 202d15fad5..3a36fd109f 100644
--- a/tools/firmware/seabios-config
+++ b/tools/firmware/seabios-config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# SeaBIOS Configuration
-# Wed Sep 7 13:03:21 2011
+# Thu Jan 3 17:25:45 2013
#
#
@@ -24,6 +24,9 @@ CONFIG_ATA_DMA=y
CONFIG_ATA_PIO32=y
CONFIG_AHCI=y
CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_SCSI=y
+CONFIG_ESP_SCSI=y
+CONFIG_LSI_SCSI=y
CONFIG_FLOPPY=y
CONFIG_PS2PORT=y
CONFIG_USB=y
@@ -31,12 +34,13 @@ CONFIG_USB_UHCI=y
CONFIG_USB_OHCI=y
CONFIG_USB_EHCI=y
CONFIG_USB_MSC=y
+CONFIG_USB_UAS=y
CONFIG_USB_HUB=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_MOUSE=y
CONFIG_SERIAL=y
CONFIG_LPT=y
-# CONFIG_USE_SMM is not set
+CONFIG_USE_SMM=y
CONFIG_MTRR_INIT=y
#
@@ -56,6 +60,7 @@ CONFIG_KEYBOARD=y
CONFIG_KBD_CALL_INT15_4F=y
CONFIG_MOUSE=y
CONFIG_S3_RESUME=y
+CONFIG_VGAHOOKS=y
# CONFIG_DISABLE_A20 is not set
#
@@ -67,7 +72,19 @@ CONFIG_SMBIOS=y
CONFIG_ACPI=y
#
+# VGA ROM
+#
+CONFIG_NO_VGABIOS=y
+# CONFIG_VGA_STANDARD_VGA is not set
+# CONFIG_VGA_CIRRUS is not set
+# CONFIG_VGA_BOCHS is not set
+# CONFIG_VGA_GEODEGX2 is not set
+# CONFIG_VGA_GEODELX is not set
+# CONFIG_BUILD_VGABIOS is not set
+
+#
# Debugging
#
CONFIG_DEBUG_LEVEL=1
# CONFIG_DEBUG_SERIAL is not set
+CONFIG_DEBUG_IO=y