From: "Wu, Hao A" <hao.a.wu@intel.com>
To: devel@edk2.groups.io
Cc: Hao A Wu <hao.a.wu@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>
Subject: [edk2-platforms][PATCH v2 11/18] Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency
Date: Mon, 20 May 2019 16:40:58 +0800 [thread overview]
Message-ID: <20190520084105.9028-12-hao.a.wu@intel.com> (raw)
In-Reply-To: <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 <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
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 <FrameworkDxe.h>
#include <Protocol/Smbios.h>
#include <IndustryStandard/SmBios.h>
#include <Library/HiiLib.h>
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 <FrameworkDxe.h>
-
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
next prev parent reply other threads:[~2019-05-20 8:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 8:40 [edk2-platforms][PATCH v2 00/18] Drop IntelFramework[Module]Pkg dependency Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 01/18] Platform/AMD: Use Lzma decompress lib in MdeModulePkg Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 02/18] Platform/BeagleBoard: Use ReportStatusCodeLib null instance Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 03/18] Platform/BeagleBoard: Drop the consume of PcdShellFile Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 04/18] Hisilicon/D0x: Use Lzma decompress lib in MdeModulePkg Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 05/18] Hisilicon/D0x: Drop the consume of GenericBdsLib & PlatformBdsLib Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 06/18] Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 07/18] Hisilicon/D06: Drop the consume of PcdShellFile Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 08/18] Silicon/Hisilicon: Use Lzma decompress lib in MdeModulePkg Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 09/18] Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) " Wu, Hao A
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 10/18] Silicon/Hisilicon: Use DebugLib (DXE_RUNTIME_DRIVER) " Wu, Hao A
2019-05-20 8:40 ` Wu, Hao A [this message]
2019-05-20 8:40 ` [edk2-platforms][PATCH v2 12/18] Silicon/Hisilicon/PlatformIntelBdsLib: Remove Hisilicon PlatformBdsLib Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 13/18] Platform/LeMaker: Use Lzma decompress lib in MdeModulePkg Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 14/18] Platform/LeMaker: Use ReportStatusCodeLib null instance Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 15/18] Platform/SoftIron: Use Lzma decompress lib in MdeModulePkg Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 16/18] Platform/SoftIron: Use ReportStatusCodeLib null instance Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 17/18] Platform/RPi3: " Wu, Hao A
2019-05-20 8:41 ` [edk2-platforms][PATCH v2 18/18] Platform/RaspberryPi: Drop the consume of PcdShellFile Wu, Hao A
2019-05-27 2:43 ` [edk2-devel] [edk2-platforms][PATCH v2 00/18] Drop IntelFramework[Module]Pkg dependency Wu, Hao A
2019-06-10 5:13 ` Wu, Hao A
2019-06-10 15:12 ` Leif Lindholm
2019-06-11 6:19 ` Wu, Hao A
2019-06-11 9:38 ` Leif Lindholm
2019-06-12 0:21 ` Wu, Hao A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190520084105.9028-12-hao.a.wu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox