diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2023-04-11 08:43:56 +0100 |
|---|---|---|
| committer | Matt DeVillier <matt.devillier@amd.corp-partner.google.com> | 2023-05-02 13:47:11 +0000 |
| commit | 14e80fd9c5075b0244894b83fefc0ae3b6474a79 (patch) | |
| tree | dbcf4393944c7fb2f76b88221b59f056f875b628 | |
| parent | a38e2484ac74c04684a2bd4339d4f43c721294c8 (diff) | |
payloads/edk2: Remove ABOVE_4G_MEMORY option
Remove the ABOVE_4G_MEMORY option as the option was removed in edk2
in commit dc5f2905ebfdf68ae28ce1081d435af0f8641dd9 (UefiPayloadPkg:
Always build MemoryTypeInformation HOB for DXE GCD
- https://github.com/tianocore/edk2/pull/4231).
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I8d5ee79ef3f7ecfcd1463c612aad2e3d629df22a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74336
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
| -rw-r--r-- | payloads/external/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/external/edk2/Kconfig | 10 | ||||
| -rw-r--r-- | payloads/external/edk2/Makefile | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5f29063bfe..d10cb15380 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -172,7 +172,6 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) CONFIG_EDK2_DEBUG=$(CONFIG_EDK2_DEBUG) \ CONFIG_EDK2_RELEASE=$(CONFIG_EDK2_RELEASE) \ CONFIG_EDK2_VERBOSE_BUILD=$(CONFIG_EDK2_VERBOSE_BUILD) \ - CONFIG_EDK2_ABOVE_4G_MEMORY=$(CONFIG_EDK2_ABOVE_4G_MEMORY) \ 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) \ @@ -213,7 +212,6 @@ $(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG) CONFIG_EDK2_CUSTOM_BUILD_PARAMS=$(CONFIG_EDK2_CUSTOM_BUILD_PARAMS) \ CONFIG_EDK2_DEBUG=$(CONFIG_EDK2_DEBUG) \ CONFIG_EDK2_RELEASE=$(CONFIG_EDK2_RELEASE) \ - CONFIG_EDK2_ABOVE_4G_MEMORY=$(CONFIG_EDK2_ABOVE_4G_MEMORY) \ 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 c166975f81..fd6bc9ba1d 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -111,16 +111,6 @@ config EDK2_VERBOSE_BUILD build log extremely verbose. This can be used to troubleshoot failed builds which are usually down to missing tools or toolchain. -config EDK2_ABOVE_4G_MEMORY - bool "Enable above 4G memory" - default n - help - Select this option to enable Above 4G Decode. This will allow the - payload to use all of the memory, rather than an maximum of 4G. - - Disabling memory above 4G is useful for bootloaders that are not - fully 64-bit aware such as Qubes R4.0.4 bootloader. - 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 21812422fb..a2a133d59d 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -43,10 +43,6 @@ endif # # OPTION = DEFAULT_VALUE # -# ABOVE_4G_MEMORY = TRUE -ifneq ($(CONFIG_EDK2_ABOVE_4G_MEMORY),y) -BUILD_STR += -D ABOVE_4G_MEMORY=FALSE -endif # BOOTSPLASH_IMAGE = FALSE ifneq ($(CONFIG_EDK2_BOOTSPLASH_FILE),) BUILD_STR += -D BOOTSPLASH_IMAGE=TRUE |