diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2021-06-02 15:19:38 -0500 |
|---|---|---|
| committer | Werner Zeh <werner.zeh@siemens.com> | 2021-06-07 05:05:24 +0000 |
| commit | ba7f116728192eb6e2993454e38b918f73e9872e (patch) | |
| tree | bc9d1b7b62ec4c7790ae689f20afd18efeb0f39f | |
| parent | 6e7f9d6824e85c45be63ceb5c6f86194ec4b38e8 (diff) | |
payloads/tianocore: Add Kconfig option to enable cbmem logging
Logging to coreboot cbmem, instead of a serial console, was
added to MrChromebox's uefipayloadpkg branch. Add a Kconfig
option to enable this, and restrict it to the UEFIPAYLOAD
payload option, since this feature does not exist in upstream
edk2.
Change-Id: Idef125235dc7ba885eb22ac69c6f752588a9e295
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55144
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Benjamin Doron <benjamin.doron00@gmail.com>
| -rw-r--r-- | payloads/external/Makefile.inc | 1 | ||||
| -rw-r--r-- | payloads/external/tianocore/Kconfig | 12 | ||||
| -rw-r--r-- | payloads/external/tianocore/Makefile | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index e30f57052d..3d465537a1 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -148,6 +148,7 @@ payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd tianocore: $(DOTCONFI CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \ CONFIG_MMCONF_BASE_ADDRESS=$(CONFIG_MMCONF_BASE_ADDRESS) \ CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \ + CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \ 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 c227bf30dd..9a331a3f03 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -53,6 +53,18 @@ config TIANOCORE_RELEASE endchoice +if TIANOCORE_UEFIPAYLOAD + +config TIANOCORE_CBMEM_LOGGING + bool "Enable Tianocore logging to CBMEM" + help + Select this option if you want to enable Tianocore logging to CBMEM. + You may want to increase the default cbmem buffer size when selecting + this option, especially if using a debug (vs release) build. + Selecting this option will increase the payload size in CBFS by ~220KB. + +endif + config TIANOCORE_BOOTSPLASH_IMAGE bool "Use a custom bootsplash image" help diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 7ab4f9edb0..e23d946dc4 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -30,9 +30,13 @@ else BUILD_TYPE=RELEASE endif +ifeq ($(CONFIG_TIANOCORE_CBMEM_LOGGING),y) +CBMEM=-D USE_CBMEM_FOR_CONSOLE=TRUE +endif + TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) -BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) +BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) $(CBMEM) all: clean build |