Change in coreboot[master]: payloads/external/tianocore: Add build argument for 4G Decode

[Sean Rhodes (Code Review)]

Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56223 )

Change subject: payloads/external/tianocore: Add build argument for 4G Decode
......................................................................

payloads/external/tianocore: Add build argument for 4G Decode

Add Kconfig option TIANOCORE_DISABLE_ABOVE_4G to pass build option to edk2 to disable
"Above 4G Decode".

Signed-off-by: Sean Rhodes 
Change-Id: Ia3b1d15196c0ec611431af29031682fea626d19d
---
M payloads/external/Makefile.inc
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Makefile
3 files changed, 12 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/56223/1

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 3d46553..9e626cb 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -147,6 +147,7 @@
    	CONFIG_TIANOCORE_UEFIPAYLOAD=$(CONFIG_TIANOCORE_UEFIPAYLOAD) \
    	CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \
    	CONFIG_MMCONF_BASE_ADDRESS=$(CONFIG_MMCONF_BASE_ADDRESS) \
+                CONFIG_TIANOCORE_DISABLE_ABOVE_4G=$(TIANOCORE_DISABLE_ABOVE_4G) \
    	CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
    	CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
    	GCC_CC_x86_32=$(GCC_CC_x86_32) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index cb3ff5d..e4ecdae 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -92,4 +92,10 @@
      For boards with an internal display, the default value of 2s is generally sufficient.
      For boards without an internal display, a value of 5s is generally sufficient.

+config TIANOCORE_DISABLE_ABOVE_4G
+        string "Disable Above 4G Decode"
+        help
+          Disable Above 4G Decode so that the DXE core only dispatches drivers below 4GB. Required
+          for Qubes (Xen).
+
 endif
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 92a809a..336d0c0 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -34,9 +34,13 @@
 CBMEM=-D USE_CBMEM_FOR_CONSOLE=TRUE
 endif

+ifeq ($(CONFIG_TIANOCORE_DISABLE_ABOVE_4G),y)
+4G=-D ABOVE_4G_ENABLE=FALSE
+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) $(CBMEM)
+BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) $(CBMEM) $(4G)

all: clean build