diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2022-07-08 16:29:54 +0100 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-08-07 19:48:17 +0000 |
| commit | 02f2b193840f68c41a91380be0dd4f435ab2f339 (patch) | |
| tree | 7f04c2316f13704861da076bb8687a8b2ebf4f85 /payloads/external/tianocore/Makefile | |
| parent | 7f96c05280904a1ad65ccc087035f26fb41efe8f (diff) | |
payloads/tianocore: Remove the option for CorebootPayloadPkg
Recent changes to both coreboot and edk2 means that UefiPayloadPkg
seems to work on all hardware. It has been tested on:
* Intel Core 2nd, 3rd, 4th, 5th, 6th, 8th, 8th, 9th, 10th,
11th and 12th generation processors
* Intel Small Core BYT, BSW, APL, GLK and GLK-R processors
* AMD Stoney Ridge and Picasso
This includes the problematic Lenovo X230s. The most likely fixes are:
* Configuring the PCI Base and Length in edk2
* Fixes to the HostBridgeLib in edk2
* Adjustment to the SD/eMMC initialisation timeout
This means we can now remove the already deprecated option for
CorebootPayloadPkg and the legacy 8254 timer build option.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Ice7b7576eb3d32ea46e5138266b7df3fbcdcf7ea
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65721
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Diffstat (limited to 'payloads/external/tianocore/Makefile')
| -rw-r--r-- | payloads/external/tianocore/Makefile | 18 |
1 files changed, 1 insertions, 17 deletions
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))) |