diff options
author | Matt DeVillier <matt.devillier@gmail.com> | 2019-02-20 23:46:15 -0600 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-02-26 11:13:11 +0000 |
commit | 38b6ccfed9d0a9ff0605f2def02033cc9523ee94 (patch) | |
tree | 71c476ddefd29a5aa6993ab1e24b52615fef499a /payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch | |
parent | da7ffb48b2c84191b29dca41e6cdce5eb05524a1 (diff) | |
download | coreboot-38b6ccfed9d0a9ff0605f2def02033cc9523ee94.tar.xz |
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>
Diffstat (limited to 'payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch')
-rw-r--r-- | payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch b/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch deleted file mode 100644 index 10024d85ab..0000000000 --- a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9c28ac87eb2df7319d4f5a48124c837b8bf123b3 Mon Sep 17 00:00:00 2001 -From: ReddestDream <reddestdream@gmail.com> -Date: Wed, 3 May 2017 00:13:28 -0400 -Subject: [PATCH] CbSupportPei: prevent lower coreboot table from being - overwritten - -Exclude the bottom 4kb from being included in System Memory HoB ---- - CorebootModulePkg/CbSupportPei/CbSupportPei.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/CorebootModulePkg/CbSupportPei/CbSupportPei.c b/CorebootModulePkg/CbSupportPei/CbSupportPei.c -index 831de89b21d1..e84b9b55288a 100755 ---- a/CorebootModulePkg/CbSupportPei/CbSupportPei.c -+++ b/CorebootModulePkg/CbSupportPei/CbSupportPei.c -@@ -261,8 +261,9 @@ CbPeiEntryPoint ( - EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | - EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE - ), -- (EFI_PHYSICAL_ADDRESS)(0), -- (UINT64)(0xA0000) -+ // Lower 640KB, except for first 4KB where the lower coreboot pointer ("LBIO") resides -+ (EFI_PHYSICAL_ADDRESS)(0 + 0x1000), -+ (UINT64)(0xA0000 - 0x1000) - ); - - --- -2.17.0 - |