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

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

Change-Id: Ifbf3b82e784f79395ab7cd07c5804f72928d7640
Signed-off-by: Antonello Dettori <dev@dettori.io>
Reviewed-on: https://review.coreboot.org/13937
Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
Tested-by: build bot (Jenkins)
This commit is contained in:
Antonello Dettori 2016-03-07 23:56:57 +00:00 committed by Martin Roth
parent d68e0476e9
commit 3aa91dc7be
3 changed files with 27 additions and 0 deletions

View File

@ -46,6 +46,8 @@ payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG)
AS="$(AS_x86_32)" IASL="$(IASL)" \ AS="$(AS_x86_32)" IASL="$(IASL)" \
CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \ CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \ 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_PAYLOAD_CONFIGFILE=$(CONFIG_PAYLOAD_CONFIGFILE) \
CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \ CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \
CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \ CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \

View File

@ -12,9 +12,25 @@ config SEABIOS_MASTER
bool "master" bool "master"
help help
Newest SeaBIOS version 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 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 config SEABIOS_PS2_TIMEOUT
prompt "PS/2 keyboard controller initialization timeout (milliseconds)" prompt "PS/2 keyboard controller initialization timeout (milliseconds)"
default 0 default 0

View File

@ -1,5 +1,6 @@
TAG-$(CONFIG_SEABIOS_MASTER)=origin/master TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4 TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4
TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID)
unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOHEADER
unexport KCONFIG_AUTOCONFIG unexport KCONFIG_AUTOCONFIG
@ -15,6 +16,14 @@ seabios:
git clone http://review.coreboot.org/p/seabios.git seabios git clone http://review.coreboot.org/p/seabios.git seabios
fetch: seabios fetch: seabios
ifeq ($(TAG-y),)
echo "Error: The specified tag is invalid"
ifeq ($(CONFIG_SEABIOS_REVISION),y)
echo "Error: There is no revision specified for SeaBIOS"
false
endif
false
endif
cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \ cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \
[ "$(TAG-y)" = "origin/master" ]; then \ [ "$(TAG-y)" = "origin/master" ]; then \
echo " Fetching new commits from the SeaBIOS git repo"; \ echo " Fetching new commits from the SeaBIOS git repo"; \