From nobody Mon Feb 9 07:23:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40557+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40557+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557799733; cv=none; d=zoho.com; s=zohoarc; b=YUSzznyfnm2NMMPeIpjE6IvjOEoHtlbB1+AWEbin6/XhBzjKb4nPoSNAxvd6nzyi6lrNZJLaBJdKMVWQIcMBhqfqzc2OACIxkO+V0JwIpTJIphS/KnYEBEAY7UW6Jock3K47teejVZo5yTG23AiAveS9lUV/mfumAk1O42Z6g+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557799733; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=SCWlQ8KiqCmXNpjiw4DQnL5sxaH+6suOfabFk6lnN1w=; b=XrVrKyB4ncJJOxvK3nECiTDR5tWb7/xTsx8kVF6EmNRSxI7zKd5c/NleTfXVrBLssSye59923MsB1AzotXMqYdG4rmPGBNBMuiQFXR+E/P39rF1z5QBq3WrXaLl4vPMLsl4NieiQHhugDTHxCW4Irf96qmy37czdZViC+z5bCro= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40557+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557799733612617.4278069520651; Mon, 13 May 2019 19:08:53 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Mon, 13 May 2019 19:08:52 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 May 2019 19:08:51 -0700 X-ExtLoop1: 1 X-Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.8]) by orsmga001.jf.intel.com with ESMTP; 13 May 2019 19:08:50 -0700 From: "Wu, Hao A" To: devel@edk2.groups.io Cc: Hao A Wu , Ard Biesheuvel , Leif Lindholm , Michael D Kinney Subject: [edk2-devel] [edk2-platforms][PATCH v1 11/16] Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency Date: Tue, 14 May 2019 10:08:26 +0800 Message-Id: <20190514020831.7728-14-hao.a.wu@intel.com> In-Reply-To: <20190514020831.7728-1-hao.a.wu@intel.com> References: <20190514020831.7728-1-hao.a.wu@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,hao.a.wu@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557799732; bh=/1+AfVcS0HM+px0yL+64WNyvfTPfWxLWXsPmpcLQeBk=; h=Cc:Date:From:Reply-To:Subject:To; b=gnzfvQh3nJ1gtQS6tD7ycMCSB7tNRNdXJOHvdJUHQ3Npg13e7xLHv8uC5ALdV7fLTfy ZUCPLDuwUhHO68WKePTcua6638CE5lW6FHymRlHN/pg4VmkbJJmpHIcYjneSVL5qNBoEu UP8VI9hvAqWry3C/DKbY1J6DEsYxyge+DQo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1800 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: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Hao A Wu 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/MiscBiosVendorFuncti= on.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufactur= erFunction.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufac= turerFunction.c | 4 ++-- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufactu= rerFunction.c | 2 +- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesign= ationFunction.c | 4 ++-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubCl= assDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubCl= assDxe.inf index 94f6fe404c..a4e2a255f5 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.= inf +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.= inf @@ -28,8 +28,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec =20 Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Processo= rSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Pr= ocessorSubClassDxe.inf index 808da65cd4..9dfa3f879f 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ssDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ssDxe.inf @@ -30,7 +30,6 @@ ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec =20 Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.i= nf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 0c37b53af9..e38d2ac1e9 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -56,8 +56,6 @@ ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec =20 diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h b/= Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h index 66f9db9665..3bf3cbdd1c 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h @@ -25,7 +25,6 @@ Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ #ifndef _SMBIOS_MISC_DRIVER_H #define _SMBIOS_MISC_DRIVER_H =20 -#include #include #include #include diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Processo= rSubClass.c b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Process= orSubClass.c index c9903ba535..f2f88e7d86 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.c +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubCla= ss.c @@ -15,8 +15,6 @@ =20 #include "ProcessorSubClass.h" =20 -#include - EFI_HII_HANDLE mHiiHandle; =20 EFI_SMBIOS_PROTOCOL *mSmbios; @@ -487,7 +485,7 @@ AddSmbiosProcessorTypeTable ( PROCESSOR_CHARACTERISTICS_DATA ProcessorCharacteristics =3D {{0}}; =20 CHAR16 *CpuVersion; - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; =20 UINT64 *ProcessorId; Type4Record =3D NULL; diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBios= VendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/Mi= scBiosVendorFunction.c index 9a42f04085..6c15a804c2 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorF= unction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorF= unction.c @@ -128,8 +128,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/MiscSyst= emManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/T= ype01/MiscSystemManufacturerFunction.c index 5e965c996c..8baf0bbc67 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManuf= acturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManuf= acturerFunction.c @@ -52,12 +52,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; =20 diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBase= BoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDx= e/Type02/MiscBaseBoardManufacturerFunction.c index a141f9e7d7..cef6887d3f 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardMa= nufacturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardMa= nufacturerFunction.c @@ -54,13 +54,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 =3D NULL; EFI_STATUS Status; =20 - 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/MiscChas= sisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/= Type03/MiscChassisManufacturerFunction.c index 4bb170117d..6f6f354b91 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManu= facturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManu= facturerFunction.c @@ -67,7 +67,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/MiscSyst= emSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDx= e/Type09/MiscSystemSlotDesignationFunction.c index 945fd4c6e3..0fa4903460 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotD= esignationFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotD= esignationFunction.c @@ -29,7 +29,7 @@ UpdateSlotDesignation ( IN SMBIOS_TABLE_TYPE9 *InputData ) { - STRING_REF TokenToUpdate; + EFI_STRING_ID TokenToUpdate; CHAR16 *SlotDesignation; UINTN DesignationStrLen; =20 @@ -140,7 +140,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 =3D NULL; --=20 2.12.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40557): https://edk2.groups.io/g/devel/message/40557 Mute This Topic: https://groups.io/mt/31614332/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-