From ba7f116728192eb6e2993454e38b918f73e9872e Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 2 Jun 2021 15:19:38 -0500 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55144 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Benjamin Doron --- payloads/external/tianocore/Kconfig | 12 ++++++++++++ payloads/external/tianocore/Makefile | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'payloads/external/tianocore') 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 -- cgit v1.2.3