diff options
| author | Saurabh Mishra <mishra.saurabh@intel.corp-partner.google.com> | 2022-11-24 11:32:23 +0530 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-11-26 23:45:26 +0000 |
| commit | 060492ecd2ab64c11a60faf0b9d2574fc95f0544 (patch) | |
| tree | 45a2a36dea40a5ff3209bd58025f7eca6733a490 /src/vendorcode/intel/edk2 | |
| parent | 9018dee6856791ab599463a771826936c20a80bb (diff) | |
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 f7e8adac7b3123 ("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>
Diffstat (limited to 'src/vendorcode/intel/edk2')
| -rw-r--r-- | src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h b/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h index 486e984cfe..4ac307a626 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h +++ b/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/SmBios.h @@ -1263,6 +1263,7 @@ typedef struct { UINT8 PortType; ///< The enumeration value from MISC_PORT_TYPE. } SMBIOS_TABLE_TYPE8; +#if !CONFIG(DISPLAY_FSP_VERSION_INFO_2) /// /// System Slots - Slot Type /// @@ -1375,6 +1376,7 @@ typedef enum { SlotLengthLong = 0x04 } MISC_SLOT_LENGTH; +#endif /// /// System Slots - Slot Characteristics 1. /// |