Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84402?usp=email )
(
5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: efi: Set EFIAPI to 32-bit ABI for FSP1_1 ......................................................................
efi: Set EFIAPI to 32-bit ABI for FSP1_1
Because PLATFORM_USES_FSP2_X86_32 default to false when PLATFORM_USES_FSP1_1, efi_datatype.h wrongly defines EFI as __attribute__((__ms_abi__)).
TEST=When some code involved in the build of a platform using FSP 1.1 such as Google/CYAN includes efi_datatype.h, it does not hit the following error: '__ms_abi__' calling convention is not supported for this target
Change-Id: I914f73ff06bfb801fc319b45b23d7ce4cb7a6d5d Signed-off-by: Jeremy Compostella jeremy.compostella@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/84402 Reviewed-by: Subrata Banik subratabanik@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/include/efi/efi_datatype.h 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Subrata Banik: Looks good to me, approved
diff --git a/src/include/efi/efi_datatype.h b/src/include/efi/efi_datatype.h index d4152af..a5e8ec3 100644 --- a/src/include/efi/efi_datatype.h +++ b/src/include/efi/efi_datatype.h @@ -13,7 +13,7 @@ * * Fortunately, EDK2 header allows to override EFIAPI. */ -#if CONFIG(PLATFORM_USES_FSP2_X86_32) +#if CONFIG(PLATFORM_USES_FSP1_1) || CONFIG(PLATFORM_USES_FSP2_X86_32) #define EFIAPI __attribute__((regparm(0))) #else #define EFIAPI __attribute__((__ms_abi__))