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: Ard Biesheuvel <ard.biesheu...@linaro.org>
Cc: Leif Lindholm <leif.lindh...@linaro.org>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Signed-off-by: Hao A Wu <hao.a...@intel.com>
---
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 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
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 808da65cd4..9dfa3f879f 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
+++
b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
@@ -30,7 +30,6 @@
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 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
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
-#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 c9903ba535..f2f88e7d86 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
@@ -15,8 +15,6 @@
#include "ProcessorSubClass.h"
-#include <FrameworkDxe.h>
-
EFI_HII_HANDLE mHiiHandle;
EFI_SMBIOS_PROTOCOL *mSmbios;
@@ -487,7 +485,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 9a42f04085..6c15a804c2 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.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/MiscSystemManufacturerFunction.c
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
index 5e965c996c..8baf0bbc67 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
+++
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.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;
diff --git
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
index a141f9e7d7..cef6887d3f 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
+++
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.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 = 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 4bb170117d..6f6f354b91 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.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/MiscSystemSlotDesignationFunction.c
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
index 945fd4c6e3..0fa4903460 100644
---
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
+++
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -29,7 +29,7 @@ UpdateSlotDesignation (
IN SMBIOS_TABLE_TYPE9 *InputData
)
{
- STRING_REF TokenToUpdate;
+ EFI_STRING_ID TokenToUpdate;
CHAR16 *SlotDesignation;
UINTN DesignationStrLen;
@@ -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 = NULL;
--
2.12.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
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/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
