From 5a26d817f79089081c0727fa12d4cfb27033c13a Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Mon, 4 Jul 2022 21:44:32 +0100 Subject: payloads/tianocore: Hook up PCI Express Base Address and Length Hook up edk2 build options PCIE_BASE_ADDRESS and PCIE_BASE_LENGTH to CONFIG_ECAM_MMCONF_BASE_ADDRESS and CONFIG_ECAM_MMCONF_LENGTH. This patch has been reviewed upstream but not yet merged (2022/07/08). It won't cause any problems for any existing branches or forks that do not have this build option hooked up. Signed-off-by: Sean Rhodes Change-Id: Ie5d50cc4619354d3c98adf6cde12c192be759869 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65644 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Lean Sheng Tan --- payloads/external/Makefile.inc | 1 + payloads/external/tianocore/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index e560cbe71a..3749b9e504 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -180,6 +180,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG) CONFIG_TIANOCORE_SD_MMC_TIMEOUT=$(CONFIG_TIANOCORE_SD_MMC_TIMEOUT) \ CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \ + CONFIG_ECAM_MMCONF_LENGTH=$(CONFIG_ECAM_MMCONF_LENGTH) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 7dcaf201b3..d7f03bf0b9 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -44,6 +44,14 @@ endif ifeq ($(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC),y) BUILD_STR += -D FOLLOW_BGRT_SPEC=TRUE endif +# PCIE_BASE_ADDRESS = 0 +ifneq ($(CONFIG_ECAM_MMCONF_LENGTH),) +BUILD_STR += --pcd gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) +endif +# PCIE_BASE_LENGTH = 0 +ifneq ($(CONFIG_ECAM_MMCONF_LENGTH),) +BUILD_STR += --pcd gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize=$(CONFIG_ECAM_MMCONF_LENGTH) +endif # PRIORITIZE_INTERNAL = FALSE ifeq ($(CONFIG_TIANOCORE_PRIORITIZE_INTERNAL),y) BUILD_STR += -D PRIORITIZE_INTERNAL=TRUE -- cgit v1.2.3