Attention is currently required from: Martin Roth, Michał Żygowski, Stefan Reinauer. Hello Michał Żygowski,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/62497
to review the following change.
Change subject: payloads/tianocore: Allow custom build parameters for custom builds ......................................................................
payloads/tianocore: Allow custom build parameters for custom builds
Currently custom TianoCore builds are allowed, but those may need different parameters. Add na Kconfig option to specify additional parameters to be appended to build comamnd.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I025459ae94592103b4be0c68b422100b7c649d34 Signed-off-by: Michał Kopeć michal.kopec@3mdeb.com --- M payloads/external/Makefile.inc M payloads/external/tianocore/Kconfig M payloads/external/tianocore/Makefile 3 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/62497/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5c15af5..42a4585 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -144,6 +144,7 @@ CONFIG_TIANOCORE_TAG_OR_REV=$(CONFIG_TIANOCORE_TAG_OR_REV) \ CONFIG_TIANOCORE_UEFIPAYLOAD=$(CONFIG_TIANOCORE_UEFIPAYLOAD) \ CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \ + CONFIG_TIANOCORE_CUSTOM=$(CONFIG_TIANOCORE_CUSTOM) \ CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \ CONFIG_TIANOCORE_DEBUG=$(CONFIG_TIANOCORE_DEBUG) \ CONFIG_TIANOCORE_RELEASE=$(CONFIG_TIANOCORE_RELEASE) \ @@ -153,6 +154,7 @@ CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \ CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \ + CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS=$(CONFIG_TIANOCORE_CUSTOM_BUILD_PARAMS) \ 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/Kconfig b/payloads/external/tianocore/Kconfig index 2ef77ba..90e2fdc 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -146,4 +146,15 @@
endif
+if TIANOCORE_CUSTOM + +config TIANOCORE_CUSTOM_BUILD_PARAMS + string "TianoCore 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 + +endif + endif diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 6dbfe72..3fe5e27 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -54,6 +54,12 @@
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 + export EDK_TOOLS_PATH=$(project_dir)/BaseTools
all: clean build @@ -96,6 +102,7 @@ build: update checktools unset CC; $(MAKE) -C $(project_dir)/BaseTools 2>&1 echo " build $(project_name) $(CONFIG_TIANOCORE_TAG_OR_REV)" + echo " build $(BUILD_STR)" if [ -n "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" ]; then \ echo " Copying custom bootsplash image"; \ case "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" in \