From c5055883eb9f57145ca8c63e50a9fbc314f6616a Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 27 Jul 2022 21:41:54 +0100 Subject: payloads/tianocore: Allow passing custom build params to all versions Allow passing custom build parameters to any version of edk2, not just forks. Signed-off-by: Sean Rhodes Change-Id: I4eed535415ba15ae73e22cada9153820538f5f6d Reviewed-on: https://review.coreboot.org/c/coreboot/+/66210 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Lean Sheng Tan --- payloads/external/tianocore/Kconfig | 10 ++++------ payloads/external/tianocore/Makefile | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'payloads') diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 72d060abc96a..0f81eabbf521 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -210,15 +210,13 @@ config TIANOCORE_USE_8254_TIMER endif -if TIANOCORE_CUSTOM - config TIANOCORE_CUSTOM_BUILD_PARAMS string "TianoCore additional custom build parameters" help - Custom TianoCore forks may have different sets of parameters passed - to build command. You may specify additional parameters to the custom - TianoCore build + edk2 has build options that are not modified by coreboot, and these can be + found in `UefiPayloadPkg/UefiPayloadPkg.dsc`. Forks may also support + additional build options that should have been upstreamed but have not. -endif + This option can support both macros `-D` and Pcds `--pcd`. endif diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index d3b88b82f45a..7f6fe9289783 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -106,11 +106,9 @@ endif # CONFIG_TIANOCORE_COREBOOTPAYLOAD bootloader = $(word 8,$(subst /, ,$(BUILD_STR))) -ifeq ($(CONFIG_TIANOCORE_CUSTOM),y) ifneq ($(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS),) BUILD_STR += $(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS) endif -endif all: clean build -- cgit v1.2.3