summaryrefslogtreecommitdiff
path: root/payloads/external/tianocore
diff options
context:
space:
mode:
Diffstat (limited to 'payloads/external/tianocore')
-rw-r--r--payloads/external/tianocore/Kconfig21
-rw-r--r--payloads/external/tianocore/Makefile18
2 files changed, 2 insertions, 37 deletions
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index 1a72142744..d1493d992f 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -14,9 +14,6 @@ choice
UefiPayload: MrChromebox's customized fork of Tianocore which works on most
x86_64 devices
Upstream: Use upstream Tianocore payload from https://github.com/tianocore/edk2
- CorebootPayload: MrChromebox's customized fork of the deprecated CorebootPayloadPkg
- Tianocore build target. It may work better on some older hardware (eg, x230)
- which does not work properly with the UefiPayloadPkg options.
config TIANOCORE_UEFIPAYLOAD
bool "UEFIPayload"
@@ -29,12 +26,6 @@ config TIANOCORE_UPSTREAM
help
Select this option if you want to use upstream EDK2 to build Tianocore.
-config TIANOCORE_COREBOOTPAYLOAD
- bool "CorebootPayload"
- help
- Select this option to build using MrChromebox's older (now deprecated)
- CorebootPayloadPkg-based Tianocore branch
-
config TIANOCORE_CUSTOM
bool "Custom"
help
@@ -45,7 +36,7 @@ endchoice
config TIANOCORE_REPOSITORY
string "URL to git repository for edk2"
default "https://github.com/tianocore/edk2" if TIANOCORE_UPSTREAM
- default "https://github.com/mrchromebox/edk2" if TIANOCORE_UEFIPAYLOAD || TIANOCORE_COREBOOTPAYLOAD
+ default "https://github.com/mrchromebox/edk2" if TIANOCORE_UEFIPAYLOAD
help
coreboot supports an array of build options which can be found below. These options
will only have an effect if the relevant options exist in the target repository.
@@ -54,7 +45,6 @@ config TIANOCORE_TAG_OR_REV
string "Insert a commit's SHA-1 or a branch name"
default "origin/uefipayload_202207" if TIANOCORE_UEFIPAYLOAD
default "origin/master" if TIANOCORE_UPSTREAM
- default "origin/coreboot_fb" if TIANOCORE_COREBOOTPAYLOAD
help
The commit's SHA-1 or branch name of the revision to use. This must exist in
TIANOCORE_REPOSITORY, and in the case of a branch name, prefixed with origin i.e.
@@ -201,15 +191,6 @@ config TIANOCORE_SERIAL_SUPPORT
endif
-if TIANOCORE_COREBOOTPAYLOAD
-
-config TIANOCORE_USE_8254_TIMER
- bool "TianoCore 8254 Timer"
- help
- Use 8254 Timer for legacy support.
-
-endif
-
config TIANOCORE_CUSTOM_BUILD_PARAMS
string "TianoCore additional custom build parameters"
default "-D VARIABLE_SUPPORT=SMMSTORE" if TIANOCORE_UEFIPAYLOAD && SMMSTORE_V2
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 9841604d09..dd6f6bd208 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -7,11 +7,7 @@ project_name = Tianocore
project_dir = $(CURDIR)/$(word 3,$(subst /, ,$(CONFIG_TIANOCORE_REPOSITORY)))
BUILD_STR = -a IA32 -a X64 -t COREBOOT
-ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y)
-BUILD_STR += -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-else
BUILD_STR += -p UefiPayloadPkg/UefiPayloadPkg.dsc
-endif
BUILD_STR += -D BOOTLOADER=COREBOOT -q
#
@@ -80,6 +76,7 @@ endif
ifneq ($(CONFIG_TIANOCORE_SD_MMC_TIMEOUT),)
BUILD_STR += -D SD_MMC_TIMEOUT=$(shell echo $$(( $(CONFIG_TIANOCORE_SD_MMC_TIMEOUT) * 1000)) )
endif
+
#
# EDKII has the below PCDs that are relevant to coreboot:
#
@@ -90,19 +87,6 @@ BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn=0
BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow=0
BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn=0
endif
-#
-# The below are legacy options only available in CorebootPayloadPkg:
-#
-# PCIE_BASE = 0
-ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y)
-ifneq ($(CONFIG_ECAM_MMCONF_BASE_ADDRESS),)
-BUILD_STR += -D PCIE_BASE=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS)
-endif
-# USE_HPET_TIMER = FALSE
-ifeq ($(CONFIG_TIANOCORE_USE_8254_TIMER),y)
-BUILD_STR += -D USE_HPET_TIMER=TRUE
-endif
-endif # CONFIG_TIANOCORE_COREBOOTPAYLOAD
bootloader = $(word 8,$(subst /, ,$(BUILD_STR)))