GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vc/intel/edk2/edk2-stable202111: Safe guard enum macro in SmBios.h 

Fix compilation issue due to enum macro redefinition by safeguarding
definitions with DISPLAY_FSP_VERSION_INFO_2 in SoC Kconfig.

Back-ported from commit f7e8adac7b ("edk2-stable202005: Update
MdePkg/Include/IndustryStandard/SmBios.h") to fix compilation issue due
to enum macro redefinition.

BUG=b:260183604
TEST=Verify MTL Rex0 build with the patch
and verify the version output prints no junk data.

Signed-off-by: Saurabh Mishra <mishra.saurabh@intel.corp-partner.google.com>
Change-Id: Ibc65d05a8b4bd232b91184ff8cd52a20cd3538ae
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69961
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Ronak Kanabar <ronak.kanabar@intel.com>
This commit is contained in:
Saurabh Mishra 2022-11-24 11:32:23 +05:30 committed by Martin L Roth
parent 9018dee685
commit 060492ecd2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h
View File

@ -1263,6 +1263,7 @@ typedef struct {
UINT8 PortType; ///< The enumeration value from MISC_PORT_TYPE. UINT8 PortType; ///< The enumeration value from MISC_PORT_TYPE.
} SMBIOS_TABLE_TYPE8; } SMBIOS_TABLE_TYPE8;
#if !CONFIG(DISPLAY_FSP_VERSION_INFO_2)
/// ///
/// System Slots - Slot Type /// System Slots - Slot Type
/// ///
@ -1375,6 +1376,7 @@ typedef enum {
SlotLengthLong = 0x04 SlotLengthLong = 0x04
} MISC_SLOT_LENGTH; } MISC_SLOT_LENGTH;
#endif
/// ///
/// System Slots - Slot Characteristics 1. /// System Slots - Slot Characteristics 1.
/// ///