summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Doron <benjamin.doron00@gmail.com>2023-05-12 01:23:11 -0400
committerMatt DeVillier <matt.devillier@gmail.com>2023-05-13 20:07:20 +0000
commit21af6b443120443181ef2e58a31f9b03d235c72c (patch)
tree16bf9aa6b24d8399a7f90e08fc7f58ce4d0b22be
parentb8a0e64d7839d709d27f120f38c64b6a5fbde9bd (diff)
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 <benjamin.doron00@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75185 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com> Reviewed-by: Sean Rhodes <sean@starlabs.systems> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
-rw-r--r--payloads/external/Makefile.inc1
-rw-r--r--payloads/external/edk2/Kconfig7
-rw-r--r--payloads/external/edk2/Makefile2
3 files changed, 1 insertions, 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