From 943e479b3e1f0c6e2555d41f3b01177cc78f273f Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Wed, 12 May 2021 23:43:46 +0800 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/54189 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- payloads/external/tianocore/Kconfig | 23 ----------------------- payloads/external/tianocore/Makefile | 8 +------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index e53be168bc39..c227bf30dda2 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -34,29 +34,6 @@ config TIANOCORE_REVISION_ID The commit's SHA-1 or branch name of the revision to use. Choose "upstream/master" 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 diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index ad0328ad3840..7ab4f9edb00d 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