[coreboot-gerrit] Patch set updated for coreboot: 5ebddfa payloads/external/SeaBIOS: Upgrade stable from 1.7.2.2 to 1.7.4

[Idwer Vollering (vidwer@gmail.com)]

Idwer Vollering (vidwer at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5093

-gerrit

commit 5ebddfa759e16be4021450eb8f7633b1aa0411ba
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sun Feb 2 11:23:26 2014 +0100

    payloads/external/SeaBIOS: Upgrade stable from 1.7.2.2 to 1.7.4
    
    Successfully tested on the Asus M2V-MX SE.
    
    Change-Id: I675a50532735b4921a664e4b24d98be17b9a1002
    Tested-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Signed-off-by: Idwer Vollering <vidwer at gmail.com>
---
 payloads/external/SeaBIOS/Makefile.inc |  5 +++-
 src/Kconfig                            | 55 ++++++++++++++++++++++++++++++++--
 src/arch/x86/Makefile.inc              |  2 +-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 84f1515..670f977 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -1,5 +1,5 @@
 TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
-TAG-$(CONFIG_SEABIOS_STABLE)=88cb66ea542906ffff8a80ef397b9e3adbb33116
+TAG-$(CONFIG_SEABIOS_STABLE)=$(call strip_quotes,$(CONFIG_SEABIOS_STABLE))
 
 unexport KCONFIG_AUTOCONFIG
 
@@ -27,6 +27,9 @@ config: checkout
 	echo "CONFIG_LZMA=y" >> $(OUT)/seabios/.config
 	echo "CONFIG_FLASH_FLOPPY=y" >> $(OUT)/seabios/.config
 	echo "CONFIG_VGAHOOKS=y" >> $(OUT)/seabios/.config
+ifeq ($(SEABIOS_STABLE_1_7_4),y)
+	echo "CONFIG_DEBUG_COREBOOT=y" >> $(OUT)/seabios/.config
+endif
 	# This shows how to force a previously set .config option *off*
 	#echo "# CONFIG_SMBIOS is not set" >> $(OUT)/seabios/.config
 
diff --git a/src/Kconfig b/src/Kconfig
index fe7dc9b..7182ec1 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -599,13 +599,54 @@ config PAYLOAD_TIANOCORE
 
 endchoice
 
+#config SEABIOS_STABLE_1_7_2
+#	bool
+#config SEABIOS_STABLE_1_7_2_1
+#	bool
+#config SEABIOS_STABLE_1_7_2_2
+#	bool
+#config SEABIOS_STABLE_1_7_3
+#	bool
+#config SEABIOS_STABLE_1_7_3_1
+#	bool
+#config SEABIOS_STABLE_1_7_3_2
+#	bool
+#config SEABIOS_STABLE_1_7_4
+#	bool
+
 choice
 	prompt "SeaBIOS version"
-	default SEABIOS_STABLE
+#	default COREBOOT_SEABIOS_STABLE_1_7_2   if SEABIOS_STABLE_1_7_2
+#	default COREBOOT_SEABIOS_STABLE_1_7_2_1 if SEABIOS_STABLE_1_7_2_1
+#	default COREBOOT_SEABIOS_STABLE_1_7_2_2 if SEABIOS_STABLE_1_7_2_2
+#	default COREBOOT_SEABIOS_STABLE_1_7_3   if SEABIOS_STABLE_1_7_3
+#	default COREBOOT_SEABIOS_STABLE_1_7_3_1 if SEABIOS_STABLE_1_7_3_1
+#	default COREBOOT_SEABIOS_STABLE_1_7_3_2 if SEABIOS_STABLE_1_7_3_2
+#	default COREBOOT_SEABIOS_STABLE_1_7_4   if SEABIOS_STABLE_1_7_4
 	depends on PAYLOAD_SEABIOS
 
-config SEABIOS_STABLE
+config SEABIOS_STABLE_1_7_2
+#config COREBOOT_SEABIOS_STABLE_1_7_2
+	bool "1.7.2"
+config SEABIOS_STABLE_1_7_2_1
+#config COREBOOT_SEABIOS_STABLE_1_7_2_1
 	bool "1.7.2.1"
+config SEABIOS_STABLE_1_7_2_2
+#config COREBOOT_SEABIOS_STABLE_1_7_2_2
+	bool "1.7.2.2"
+config SEABIOS_STABLE_1_7_3
+#config COREBOOT_SEABIOS_STABLE_1_7_3
+	bool "1.7.3"
+config SEABIOS_STABLE_1_7_3_1
+#config COREBOOT_SEABIOS_STABLE_1_7_3_1
+	bool "1.7.3.1"
+config SEABIOS_STABLE_1_7_3_2
+#config COREBOOT_SEABIOS_STABLE_1_7_3_2
+	bool "1.7.3.2"
+config SEABIOS_STABLE_1_7_4
+#config COREBOOT_SEABIOS_STABLE_1_7_4
+	bool "1.7.4"
+
 	help
 	  Stable SeaBIOS version
 config SEABIOS_MASTER
@@ -614,6 +655,16 @@ config SEABIOS_MASTER
 	  Newest SeaBIOS version
 endchoice
 
+config SEABIOS_STABLE
+	string
+	default "4bd8aebf3534e10d9aa21e820903f2cf9120708c" if SEABIOS_STABLE_1_7_2
+	default "88cb66ea542906ffff8a80ef397b9e3adbb33116" if SEABIOS_STABLE_1_7_2_1
+	default "d4f7d90f47462b4e8836899adc5060fbde5253e9" if SEABIOS_STABLE_1_7_2_2
+	default "c02c219cd79299a0a153ecf862f0e301a057f2cb" if SEABIOS_STABLE_1_7_3
+	default "7d9cbe613694924921ed1a6f8947d711c5832eee" if SEABIOS_STABLE_1_7_3_1
+	default "ece025f5980bae88fa677bc9c0d24d2e580e205d" if SEABIOS_STABLE_1_7_3_2
+	default "96917a8ed761f017fc8c72ba3b9181fbac03ac59" if SEABIOS_STABLE_1_7_4
+
 config SEABIOS_PS2_TIMEOUT
 	prompt "PS/2 keyboard controller initialization timeout (milliseconds)" if PAYLOAD_SEABIOS
 	default 0
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 3b17ce3..4435703 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -467,7 +467,7 @@ seabios:
 			OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
 			AS="$(AS)" CPP="$(CPP)" \
 			CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
-			CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
+			CONFIG_SEABIOS_STABLE=$(call strip_quotes,$(CONFIG_SEABIOS_STABLE)) \
 			OUT=$(abspath $(obj)) IASL="$(IASL)"
 
 filo: