From 21af6b443120443181ef2e58a31f9b03d235c72c Mon Sep 17 00:00:00 2001 From: Benjamin Doron Date: Fri, 12 May 2023 01:23:11 -0400 Subject: [PATCH] payloads/external/edk2: Verbose builds with coreboot build-system Rather than requiring another Kconfig symbol to be set, reuse the same `make V=1` command argument. This simplifies rebuilds with a single point of reference. Also, this means that coreboot doesn't have to be rebuilt due to Kconfig changes. Change-Id: I9eba86b234768641a215095b8657e9d07832b1b5 Signed-off-by: Benjamin Doron Reviewed-on: https://review.coreboot.org/c/coreboot/+/75185 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Lean Sheng Tan Reviewed-by: Sean Rhodes Reviewed-by: Matt DeVillier --- payloads/external/Makefile.inc | 1 - payloads/external/edk2/Kconfig | 7 ------- payloads/external/edk2/Makefile | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d10cb15380..b88356f1d3 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -171,7 +171,6 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) CONFIG_EDK2_PLATFORMS_TAG_OR_REV=$(CONFIG_EDK2_PLATFORMS_TAG_OR_REV) \ CONFIG_EDK2_DEBUG=$(CONFIG_EDK2_DEBUG) \ CONFIG_EDK2_RELEASE=$(CONFIG_EDK2_RELEASE) \ - CONFIG_EDK2_VERBOSE_BUILD=$(CONFIG_EDK2_VERBOSE_BUILD) \ CONFIG_EDK2_BOOTSPLASH_FILE=$(CONFIG_EDK2_BOOTSPLASH_FILE) \ CONFIG_EDK2_BOOT_MANAGER_ESCAPE=$(CONFIG_EDK2_BOOT_MANAGER_ESCAPE) \ CONFIG_EDK2_BOOT_TIMEOUT=$(CONFIG_EDK2_BOOT_TIMEOUT) \ diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index fd6bc9ba1d..6dca09730b 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -104,13 +104,6 @@ config EDK2_RELEASE endchoice -config EDK2_VERBOSE_BUILD - bool "Output verbose build log for troubleshooting build failures" - help - Switch off the `-q` (quiet) and `-s` (silent) build arguments which makes the - build log extremely verbose. This can be used to troubleshoot failed builds - which are usually down to missing tools or toolchain. - config EDK2_BOOTSPLASH_FILE string "edk2 Bootsplash path and filename" default "Documentation/coreboot_logo.bmp" diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index a2a133d59d..a2649a6e43 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -30,7 +30,7 @@ BUILD_STR = -p UefiPayloadPkg/UefiPayloadPkg.dsc endif BUILD_STR += -t COREBOOT BUILD_STR += -D BOOTLOADER=COREBOOT -ifneq ($(CONFIG_EDK2_VERBOSE_BUILD),y) +ifneq ($(V),1) BUILD_STR += -q ifeq ($(CONFIG_EDK2_UEFIPAYLOAD),y) BUILD_STR += -s