From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: hao.a.wu@intel.com) Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 01:41:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 01:41:20 -0700 X-ExtLoop1: 1 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.8]) by orsmga003.jf.intel.com with ESMTP; 20 May 2019 01:41:19 -0700 From: "Wu, Hao A" To: devel@edk2.groups.io Cc: Hao A Wu , Michael D Kinney Subject: [edk2-platforms][PATCH v2 11/18] Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency Date: Mon, 20 May 2019 16:40:58 +0800 Message-Id: <20190520084105.9028-12-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190520084105.9028-1-hao.a.wu@intel.com> References: <20190520084105.9028-1-hao.a.wu@intel.com> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800 The below 3 Smbios drivers have dependency on IntelFramework[Module]Pkg: * MemorySubClassDxe * ProcessorSubClassDxe * SmbiosMiscDxe Their dependency is on the header file: IntelFrameworkPkg/Include/FrameworkDxe.h for definition 'STRING_REF'. This definition can be replaced by 'EFI_STRING_ID', which is defined within MdePkg. Cc: Michael D Kinney Signed-off-by: Hao A Wu Reviewed-by: Leif Lindholm Reviewed-by: Ard Biesheuvel --- Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf | 2 -- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf | 1 - Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 2 -- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h | 1 - Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c | 4 +--- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c | 2 +- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c | 4 ++-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf index 973b917e3b..67b9af5a81 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf @@ -22,8 +22,6 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf index 94a753a044..99eea93b79 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf @@ -24,7 +24,6 @@ [Packages] ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 002b462d51..9c795b5fd4 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -51,8 +51,6 @@ [Packages] ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h index 416a6e88f1..4692eb7133 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h @@ -19,7 +19,6 @@ Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ #ifndef _SMBIOS_MISC_DRIVER_H #define _SMBIOS_MISC_DRIVER_H -#include #include #include #include diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c index 75af47b330..647632f15a 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c @@ -9,8 +9,6 @@ #include "ProcessorSubClass.h" -#include - EFI_HII_HANDLE mHiiHandle; EFI_SMBIOS_PROTOCOL *mSmbios; @@ -481,7 +479,7 @@ AddSmbiosProcessorTypeTable ( PROCESSOR_CHARACTERISTICS_DATA ProcessorCharacteristics = {{0}}; CHAR16 *CpuVersion; - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; UINT64 *ProcessorId; Type4Record = NULL; diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c index 78bc096004..b62ec1dd8f 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -122,8 +122,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor) CHAR16 *ReleaseDate; CHAR16 *Char16String; EFI_STATUS Status; - STRING_REF TokenToUpdate; - STRING_REF TokenToGet; + EFI_STRING_ID TokenToUpdate; + EFI_STRING_ID TokenToGet; SMBIOS_TABLE_TYPE0 *SmbiosRecord; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE0 *InputData; diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c index 9f6c406543..f829b09d9c 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c @@ -46,12 +46,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) EFI_STRING SerialNumber; EFI_STRING SKUNumber; EFI_STRING Family; - STRING_REF TokenToGet; + EFI_STRING_ID TokenToGet; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE1 *SmbiosRecord; SMBIOS_TABLE_TYPE1 *InputData; EFI_STATUS Status; - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; CHAR16 *Product; CHAR16 *pVersion; diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c index 76fa1ccc7f..3834bf93f7 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c @@ -48,13 +48,13 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) EFI_STRING SerialNumber; EFI_STRING AssetTag; EFI_STRING ChassisLocation; - STRING_REF TokenToGet; + EFI_STRING_ID TokenToGet; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE2 *SmbiosRecord; SMBIOS_TABLE_TYPE2 *InputData = NULL; EFI_STATUS Status; - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; //CHAR16 *ProductName; //CHAR16 *pVersion; //uniBIOS_y00216284_018_end 2015-1-13 09:08:22 diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c index 79795ad1e4..ec00e1cd10 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c @@ -61,7 +61,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer) EFI_STRING SerialNumber; EFI_STRING AssertTag; EFI_STRING ChassisSkuNumber; - STRING_REF TokenToGet; + EFI_STRING_ID TokenToGet; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE3 *SmbiosRecord; SMBIOS_TABLE_TYPE3 *InputData; diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c index e921155ad1..ca1a7a2c00 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c @@ -23,7 +23,7 @@ UpdateSlotDesignation ( IN SMBIOS_TABLE_TYPE9 *InputData ) { - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; CHAR16 *SlotDesignation; UINTN DesignationStrLen; @@ -134,7 +134,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation) UINTN SlotDesignationStrLen; EFI_STATUS Status; EFI_STRING SlotDesignation; - STRING_REF TokenToGet; + EFI_STRING_ID TokenToGet; SMBIOS_TABLE_TYPE9 *SmbiosRecord; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE9 *InputData = NULL; -- 2.12.0.windows.1