From f7e8adac7b312326d68df80e24c13c7757e5050b Mon Sep 17 00:00:00 2001 From: Ronak Kanabar Date: Thu, 1 Oct 2020 20:05:37 +0530 Subject: [PATCH] edk2-stable202005: Update MdePkg/Include/IndustryStandard/SmBios.h Update MdePkg/Include/IndustryStandard/SmBios.h to avoid compilation errors through safeguarding definitions with DISPLAY_FSP_VERSION_INFO_2 Kconfig. BUG=b:153038236 BRANCH=None TEST=Verify JSLRVP build with all the patches in relation chain and verify the version output prints no junk data observed. Couple of lines from logs are as below. Display FSP Version Info HOB Reference Code - CPU = 8.7.16.10 uCode Version = 0.0.0.1 Change-Id: I9698861be1f969ddca7f171767a54ac486502c74 Signed-off-by: Ronak Kanabar Reviewed-on: https://review.coreboot.org/c/coreboot/+/45906 Reviewed-by: Subrata Banik Reviewed-by: Maulik V Vaghela Reviewed-by: Werner Zeh Tested-by: build bot (Jenkins) --- .../edk2-stable202005/MdePkg/Include/IndustryStandard/SmBios.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/SmBios.h b/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/SmBios.h index c04df502a4..be0c3a4f73 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/SmBios.h +++ b/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/SmBios.h @@ -1246,6 +1246,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 /// @@ -1358,6 +1359,8 @@ typedef enum { SlotLengthLong = 0x04 } MISC_SLOT_LENGTH; +#endif + /// /// System Slots - Slot Characteristics 1. ///