From cf4c6fd225feb462cca38bf9b8ff9a7d55b09bc6 Mon Sep 17 00:00:00 2001 From: Appukuttan V K Date: Tue, 14 May 2024 23:23:34 +0530 Subject: vc/edk2-stable202302: Remove FSPM_ARCH_UPD config guard This commit removes config guard around FSPM_ARCH_UPD from the FspApi.h header file. This change is done to ensure that this header file can be used with both x86_32 and x86_64 architectures and also with different FSP specification versions. The following modifications are made: - Removes PLATFORM_USES_FSP2_X86_32 config guard around FSPM_ARCH_UPD, this was added to isolate the structure from x64 build. This is not really required since the x64 build uses FSP2.4 structures. BUG=b:343428206 TEST=Verified x86_32 and x86_64 builds on Meteor Lake board (Rex) Change-Id: Idc849de73723036323f81dfd055730f6669cd52e Signed-off-by: Appukuttan V K Reviewed-on: https://review.coreboot.org/c/coreboot/+/82425 Reviewed-by: Dinesh Gehlot Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- .../intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/vendorcode') diff --git a/src/vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h b/src/vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h index 388fcedc10..9efcfa9fd2 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h +++ b/src/vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h @@ -155,8 +155,6 @@ typedef struct { UINT8 Reserved1[16]; } FSPT_ARCH2_UPD; -#if CONFIG(PLATFORM_USES_FSP2_X86_32) - /// /// FSPM_ARCH_UPD Configuration. /// @@ -204,8 +202,6 @@ typedef struct { UINT8 Reserved1[4]; } FSPM_ARCH_UPD; -#endif - /// /// FSPM_ARCH2_UPD Configuration for FSP 2.4 and above. /// -- cgit v1.2.3