summaryrefslogtreecommitdiff
path: root/payloads/external
diff options
context:
space:
mode:
authorLijian Zhao <lijian.zhao@intel.com>2021-05-12 23:43:46 +0800
committerPatrick Georgi <pgeorgi@google.com>2021-05-18 10:04:47 +0000
commit943e479b3e1f0c6e2555d41f3b01177cc78f273f (patch)
treec90c5d693c07dfceaa23eb812ad4b762d4b0311b /payloads/external
parent1e0f77fa03f286d49fbbdfaa51f6f9e2b253b737 (diff)
downloadcoreboot-943e479b3e1f0c6e2555d41f3b01177cc78f273f.tar.xz
payload/tianocore: Drop TIANOCORE_TARGET_IA32
Since upstream edk2 totally drop 32-bit support for UefiPayload, totaly drop it. Test: Build and run qemu successful boot up into EFI shell with UEFIPAYLOAD option. Change-Id: Iadd9a3c455fad4eede8a0a017415acd2c57fba04 Signed-off-by: Lijian Zhao <lijian.zhao@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/54189 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads/external')
-rw-r--r--payloads/external/tianocore/Kconfig23
-rw-r--r--payloads/external/tianocore/Makefile8
2 files changed, 1 insertions, 30 deletions
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index e53be168bc..c227bf30dd 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -35,29 +35,6 @@ config TIANOCORE_REVISION_ID
for master branch of Tianocore release on github.
choice
- prompt "Target architecture"
- default TIANOCORE_TARGET_X64
- help
- The Tianocore coreboot Payload Package binary can be
- built for either only IA32 or both X64 and IA32 architectures.
- Select which architecture(s) to build for; default is to build
- for both X64 and IA32.
-
-config TIANOCORE_TARGET_IA32
- bool "IA32"
- help
- By selecting this option, the target architecture will be built
- for only IA32.
-
-config TIANOCORE_TARGET_X64
- bool "X64"
- help
- By selecting this option, the target architecture will be built
- for X64 and IA32.
-
-endchoice
-
-choice
prompt "Tianocore build"
default TIANOCORE_RELEASE
help
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index ad0328ad38..7ab4f9edb0 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -32,13 +32,7 @@ endif
TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
-ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y)
-ARCH=-a IA32
-else
-ARCH=-a IA32 -a X64
-endif
-
-BUILD_STR=-q $(ARCH) -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)
all: clean build