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>

1 files changed, 0 insertions, 56 deletions

diff --git a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch b/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch
deleted file mode 100644
index 2b7da9d9fb..0000000000
--- a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e8d6ed35c15b92497cd3ede6cd35523b0e7366ac Mon Sep 17 00:00:00 2001
-From: CoolStar <coolstarorganization@gmail.com>
-Date: Sun, 4 Dec 2016 11:50:00 -0800
-Subject: [PATCH] CorebootPayloadPkg: Add PS/2 keyboard drivers.
-
----
- CorebootPayloadPkg/CorebootPayloadPkg.fdf        | 3 +++
- CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc    | 3 +++
- CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 3 +++
- 3 files changed, 9 insertions(+)
-
-diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-index 22987093da58..0961e96c250d 100644
---- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-@@ -132,6 +132,9 @@ INF DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
- # ISA Support

- #

- INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

-+INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf

-+INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf

-+INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf

- 

- #

- # Console Support

-diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-index 053f380a8608..6ddd64faf7a5 100644
---- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-@@ -492,6 +492,9 @@
-   # ISA Support

-   #

-   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

-+  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf

-+  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf

-+  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf

- 

-   #

-   # Console Support

-diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-index bb328349b44a..19c203e6cbb6 100644
---- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-@@ -493,6 +493,9 @@
-   # ISA Support

-   #

-   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

-+  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf

-+  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf

-+  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf

- 

-   #

-   # Console Support

--- 
-2.17.0
-