Patch set updated for coreboot: payloads/seabios: Add "git revision" to the SeaBIOS version menu

[Antonello Dettori]

Antonello Dettori ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13937

-gerrit

commit 1277de084bb75874953a4a16bf83e9c3a905d967
Author: Antonello Dettori 
Date:   Mon Mar 7 23:56:57 2016 +0000

payloads/seabios: Add "git revision" to the SeaBIOS version menu

Adds an option to specify a git revision from which to build SeaBIOS.

Change-Id: Ifbf3b82e784f79395ab7cd07c5804f72928d7640
    Signed-off-by: Antonello Dettori 
---
 payloads/external/Makefile.inc         |  2 ++
 payloads/external/SeaBIOS/Kconfig      | 16 ++++++++++++++++
 payloads/external/SeaBIOS/Makefile.inc |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 557de2a..5eb1062 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -45,6 +45,8 @@ seabios:
    		AS="$(AS_x86_32)" IASL="$(IASL)" \
    		CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
    		CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
+			CONFIG_SEABIOS_REVISION=$(CONFIG_SEABIOS_REVISION) \
+			CONFIG_SEABIOS_REVISION_ID=$(CONFIG_SEABIOS_REVISION_ID) \
    		CONFIG_PAYLOAD_CONFIGFILE=$(CONFIG_PAYLOAD_CONFIGFILE) \
    		CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \
    		CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \
diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig
index 70f5ce2..8a8d931 100644
--- a/payloads/external/SeaBIOS/Kconfig
+++ b/payloads/external/SeaBIOS/Kconfig
@@ -12,9 +12,25 @@ config SEABIOS_MASTER
    bool "master"
    help
      Newest SeaBIOS version
+config SEABIOS_REVISION
+	bool "git revision"
+	help
+	  Select this option if you have a specific commit or branch
+	  that you want to use as the revision from which to
+	  build SeaBIOS.
+
+	  You will be able to specify the name of a branch or a commit id
+	  later.

endchoice

+config SEABIOS_REVISION_ID
+	string "Insert a commit's SHA-1 or a branch name"
+	depends on SEABIOS_REVISION
+	default "origin/master"
+	help
+	   The commit's SHA-1 or branch name of the revision to use.
+
 config SEABIOS_PS2_TIMEOUT
    prompt "PS/2 keyboard controller initialization timeout (milliseconds)"
    default 0
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index e478a09..a722eed 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -1,5 +1,6 @@
 TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
 TAG-$(CONFIG_SEABIOS_STABLE)=01a84bea2d28a19d2405c1ecac4bdef17683cc0c
+TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID)

unexport KCONFIG_AUTOHEADER
 unexport KCONFIG_AUTOCONFIG
@@ -31,6 +32,12 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
 else
    echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config
 endif
+ifeq ($(CONFIG_SEABIOS_REVISION),y)
+ifeq ($(CONFIG_SEABIOS_REVISION_ID),)
+	echo "Error: There is no revision specified for SeaBIOS"
+	false
+endif
+endif
 ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
    echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config
 endif