payloads/tianocore: default to MrChromebox's working branch

Rather than attempt to maintain patches against upstream Tianocore, use
MrChromebox's coreboot framebuffer branch as the default build target.

Rework the Makefile to default to MrChromebox's coreboot_fb branch, but
also allow for aribitrary commits from upstream Tianocore to be used
as build targets.

Ensure the branch is synced on each build, as long as working directory
is clean, and that switching between commits or trees is handled sanely.

Eliminate TIANOCORE_MASTER as a selectable build target, since unpatched
it is unlikely to boot on any device. It can easily be specified via
the 'revision' option if desired.

Test: build for the default stable target, for upstream/master
as the specified revision, and for an arbitrary valid commit hash.

Change-Id: I4a83db3cd64c7d5b652c6e95780d10051f143e88
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31543
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Matt DeVillier
2019-02-20 23:46:15 -06:00
committed by Patrick Georgi
parent da7ffb48b2
commit 38b6ccfed9
10 changed files with 33 additions and 2956 deletions

View File

@@ -11,28 +11,22 @@ choice
default TIANOCORE_STABLE
help
Select which version of Tianocore to build (default is to build stable)
stable: a version of Tianocore that builds without any errors
master: most recent version from upstream Tianocore repository
stable: MrChromebox's customized version of Tianocore which works on most
(all?) x86_64 devices
revision: use specific commit or branch to build Tianocore (specified by user)
config TIANOCORE_STABLE
bool "stable"
help
Select this option to build the stable tianocore version
i.e. a version of Tianocore that builds without any errors
config TIANOCORE_MASTER
bool "master"
help
Select this option to build the master tianocore version
i.e. most recent version from upstream Tianocore repository
Select this option to build using MrChromebox's custom Tianocore tree
i.e. a version of Tianocore that builds without any errors and just works.
config TIANOCORE_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 Tianocore.
that you want to use from either MrChromebox's tree or upstream
EDK2 from which to build Tianocore.
You will be able to specify the name of a branch or a commit id
later.
@@ -42,7 +36,7 @@ endchoice
config TIANOCORE_REVISION_ID
string "Insert a commit's SHA-1 or a branch name"
depends on TIANOCORE_REVISION
default "origin/master"
default "upstream/master"
help
The commit's SHA-1 or branch name of the revision to use.