Attention is currently required from: Ronak Kanabar, Subrata Banik.
Appukuttan V K has posted comments on this change by Appukuttan V K. ( https://review.coreboot.org/c/coreboot/+/82425?usp=email )
Change subject: vc/edk2-stable202302: Remove FSPM_ARCH_UPD config guard ......................................................................
Patch Set 26:
(3 comments)
Commit Message:
https://review.coreboot.org/c/coreboot/+/82425/comment/fcfa9c86_d98f8196?usp... : PS23, Line 16: - Guard x86_32 architecture specific structures under : PLATFORM_USES_FSP2_X86_32 config. : - Guard FSP 2.4 specific structures under PLATFORM_USES_FSP2_4 : config.
I don't think so, we are not building both code at same time. […]
I removed all the config guards including the pre existing one (Introduced in https://review.coreboot.org/c/coreboot/+/62847/2). It builds fine in both x32 and x64. That existing guard on FSPM_ARCH_UPD was causing the compile issue within this file itself.
https://review.coreboot.org/c/coreboot/+/82425/comment/1a91ae2b_fd468c06?usp... : PS23, Line 21: b:343428206
please specify the child bugs if you have created any to fix the EDK2 cherrypicks as well here.
No additional changes are required for this. After removing the existing x32 guard both builds fine.
File src/vendorcode/intel/edk2/edk2-stable202302/IntelFsp2Pkg/Include/FspEas/FspApi.h:
https://review.coreboot.org/c/coreboot/+/82425/comment/966bc522_0cd18385?usp... : PS23, Line 382: } FSPT_UPD_COMMON_FSP24;
FSPT is not used anywhere so it is not causing any issue. Do you want to guard this anyway. […]
I have removed all the guards now.