diff mbox

[Xen-devel,1/2] tools: update to seabios rel-1.7.4

Message ID 1400058604-1345-1-git-send-email-ian.campbell@citrix.com
State Accepted
Commit cde61591f93c6bd0a8c3b43f65f06674a1b93293
Headers show

Commit Message

Ian Campbell May 14, 2014, 9:10 a.m. UTC 
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Config.mk                     |    6 +++---
 tools/firmware/seabios-config |   10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

Comments

Ian Jackson June 2, 2014, 2:05 p.m. UTC | #1 
Ian Campbell writes ("[PATCH 1/2] tools: update to seabios rel-1.7.4"):
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Looks plausible.

Ian.
Ian Campbell June 2, 2014, 2:42 p.m. UTC | #2 
On Mon, 2014-06-02 at 15:05 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH 1/2] tools: update to seabios rel-1.7.4"):
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Looks plausible.
> 

Thanks, I've applied them both.

Ian.
diff mbox

Patch

diff --git a/Config.mk b/Config.mk
index 6a93533..5e03e87 100644
--- a/Config.mk
+++ b/Config.mk
@@ -235,9 +235,9 @@  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
 QEMU_UPSTREAM_REVISION ?= master
-SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
-# Fri Aug 2 14:12:09 2013 -0400
-# Fix bug in CBFS file walking with compressed files.
+SEABIOS_UPSTREAM_TAG ?= rel-1.7.4
+# Sun Dec 22 10:42:26 2013 -0500
+# coreboot: Make sure to print the SeaBIOS version in cbmem debug output.
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
index a497162..f42d497 100644
--- a/tools/firmware/seabios-config
+++ b/tools/firmware/seabios-config
@@ -1,7 +1,6 @@ 
 #
-# Automatically generated make config: don't edit
+# Automatically generated file; DO NOT EDIT.
 # SeaBIOS Configuration
-# Mon Sep 23 12:59:01 2013
 #
 
 #
@@ -19,6 +18,8 @@  CONFIG_BOOTMENU=y
 # CONFIG_BOOTSPLASH is not set
 CONFIG_BOOTORDER=y
 CONFIG_ENTRY_EXTRASTACK=y
+CONFIG_MALLOC_UPPERMEMORY=y
+CONFIG_ROM_SIZE=0
 
 #
 # Hardware support
@@ -29,6 +30,7 @@  CONFIG_ATA_PIO32=y
 CONFIG_AHCI=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_SCSI=y
+CONFIG_PVSCSI=y
 CONFIG_ESP_SCSI=y
 CONFIG_LSI_SCSI=y
 CONFIG_MEGASAS=y
@@ -38,6 +40,7 @@  CONFIG_USB=y
 CONFIG_USB_UHCI=y
 CONFIG_USB_OHCI=y
 CONFIG_USB_EHCI=y
+CONFIG_USB_XHCI=y
 CONFIG_USB_MSC=y
 CONFIG_USB_UAS=y
 CONFIG_USB_HUB=y
@@ -68,6 +71,7 @@  CONFIG_MOUSE=y
 CONFIG_S3_RESUME=y
 CONFIG_VGAHOOKS=y
 # CONFIG_DISABLE_A20 is not set
+# CONFIG_WRITABLE_UPPERMEMORY is not set
 
 #
 # BIOS Tables
@@ -77,6 +81,7 @@  CONFIG_MPTABLE=y
 CONFIG_SMBIOS=y
 CONFIG_ACPI=y
 CONFIG_ACPI_DSDT=y
+CONFIG_FW_ROMFILE_LOAD=y
 
 #
 # VGA ROM
@@ -88,6 +93,7 @@  CONFIG_NO_VGABIOS=y
 # CONFIG_VGA_GEODEGX2 is not set
 # CONFIG_VGA_GEODELX is not set
 # CONFIG_BUILD_VGABIOS is not set
+CONFIG_VGA_EXTRA_STACK_SIZE=512
 
 #
 # Debugging