Hisilicon: rename OemMiscLib class to HisiOemMiscLib

Edk2 commit [1] introduced the <OemMiscLib.h> library class header to ArmPkg; commit [2] introduced the first OemMiscLib instance to ArmPkg; and commit [3] introduced (retroactively) the library class itself to ArmPkg. Alas, when all these edk2 commits were made, edk2-platforms already had a (Hisilicon-specific) library class called OemMiscLib -- and many of the Hisilicon modules would use both "HisiPkg.dec" and "ArmPkg.dec". Therefore the edk2 OemMiscLib brought about a library class conflict, breaking both edk2-platforms and edk2-non-osi content. Rename the original OemMiscLib class to HisiOemMiscLib, and update all references. This patch is necessary for building the D03, D05, D06, HiKey, and HiKey960 platforms. [1] 2c7c64fc04a0 ("ArmPkg: Add Library/OemMiscLib.h", 2021-02-08) [2] 0e51d7e445e0 ("ArmPkg: Add Universal/Smbios/OemMiscLibNull", 2021-02-08) [3] d03f71dd8be6 ("ArmPkg: Add missing library headers to ArmPkg.dec", 2021-04-28) Cc: Leif Lindholm <[email protected]> Cc: Wenyi Xie <[email protected]> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4564 Signed-off-by: Laszlo Ersek <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]>
worproject · Oct 13, 2023 · a77cf41 · a77cf41
1 parent 5cfb1a7
commit a77cf41
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 36 deletions.
diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
@@ -61,7 +61,7 @@
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
   RealTimeClockLib|Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
 
-  OemMiscLib|Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
+  HisiOemMiscLib|Platform/Hisilicon/D03/Library/HisiOemMiscLib2P/HisiOemMiscLib2PHi1610.inf
   OemAddressMapLib|Platform/Hisilicon/D03/Library/OemAddressMap2P/OemAddressMap2PHi1610.inf
   PlatformSysCtrlLib|Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf
 

diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
@@ -18,7 +18,7 @@
 #include <PlatformArch.h>
 #include <Library/PlatformSysCtrlLib.h>
 
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/OemAddressMapLib.h>
 #include <Library/ArmLib.h>
 

diff --git a/...brary/OemMiscLib2P/BoardFeature2PHi1610.c → ...y/HisiOemMiscLib2P/BoardFeature2PHi1610.c b/...brary/OemMiscLib2P/BoardFeature2PHi1610.c → ...y/HisiOemMiscLib2P/BoardFeature2PHi1610.c
@@ -14,7 +14,7 @@
 #include <IndustryStandard/SmBios.h>
 
 #include <PlatformArch.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/I2CLib.h>
 #include <Library/HiiLib.h>
 
@@ -181,7 +181,7 @@ OemGetPackages (
     return HiiAddPackages (
                             &gEfiCallerIdGuid,
                             NULL,
-                            OemMiscLib2PStrings,
+                            HisiOemMiscLib2PStrings,
                             NULL,
                             NULL
                             );

diff --git a/...MiscLib2P/BoardFeature2PHi1610Strings.uni → ...MiscLib2P/BoardFeature2PHi1610Strings.uni b/...MiscLib2P/BoardFeature2PHi1610Strings.uni → ...MiscLib2P/BoardFeature2PHi1610Strings.uni
diff --git a/...brary/OemMiscLib2P/OemMiscLib2PHi1610.inf → ...siOemMiscLib2P/HisiOemMiscLib2PHi1610.inf b/...brary/OemMiscLib2P/OemMiscLib2PHi1610.inf → ...siOemMiscLib2P/HisiOemMiscLib2PHi1610.inf
@@ -9,11 +9,11 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = OemMiscLib2P
+  BASE_NAME                      = HisiOemMiscLib2P
   FILE_GUID                      = B9CE7465-21A2-4ecd-B347-BBDDBD098CEE
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = OemMiscLib
+  LIBRARY_CLASS                  = HisiOemMiscLib
 
 [Sources.common]
   BoardFeature2PHi1610.c

diff --git a/...Library/OemMiscLib2P/OemMiscLib2PHi1610.c → ...ary/HisiOemMiscLib2P/OemMiscLib2PHi1610.c b/...Library/OemMiscLib2P/OemMiscLib2PHi1610.c → ...ary/HisiOemMiscLib2P/OemMiscLib2PHi1610.c
@@ -14,7 +14,7 @@
 #include <Library/IoLib.h>
 #include <Library/TimerLib.h>
 #include <Library/SerialPortLib.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <PlatformArch.h>
 #include <Library/PlatformSysCtrlLib.h>
 #include <Library/OemAddressMapLib.h>

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
@@ -68,7 +68,7 @@
   #D05 RTC hardware is same as D03
   RealTimeClockLib|Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
 
-  OemMiscLib|Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
+  HisiOemMiscLib|Platform/Hisilicon/D05/Library/HisiOemMiscLibD05/HisiOemMiscLibD05.inf
   OemAddressMapLib|Platform/Hisilicon/D05/Library/OemAddressMapD05/OemAddressMapD05.inf
   PlatformSysCtrlLib|Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf
 

diff --git a/...5/Library/OemMiscLibD05/BoardFeatureD05.c → ...brary/HisiOemMiscLibD05/BoardFeatureD05.c b/...5/Library/OemMiscLibD05/BoardFeatureD05.c → ...brary/HisiOemMiscLibD05/BoardFeatureD05.c
@@ -13,9 +13,9 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HiiLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/I2CLib.h>
 #include <Library/IoLib.h>
-#include <Library/OemMiscLib.h>
 #include <Protocol/Smbios.h>
 
 
@@ -209,7 +209,7 @@ OemGetPackages (
   return HiiAddPackages (
                         &gEfiCallerIdGuid,
                         NULL,
-                        OemMiscLibHi1616EvbStrings,
+                        HisiOemMiscLibHi1616EvbStrings,
                         NULL,
                         NULL
                         );

diff --git a/.../OemMiscLibD05/BoardFeatureD05Strings.uni → ...iOemMiscLibD05/BoardFeatureD05Strings.uni b/.../OemMiscLibD05/BoardFeatureD05Strings.uni → ...iOemMiscLibD05/BoardFeatureD05Strings.uni
diff --git a/...5/Library/OemMiscLibD05/OemMiscLibD05.inf → ...y/HisiOemMiscLibD05/HisiOemMiscLibD05.inf b/...5/Library/OemMiscLibD05/OemMiscLibD05.inf → ...y/HisiOemMiscLibD05/HisiOemMiscLibD05.inf
@@ -9,11 +9,11 @@
 
 [Defines]
   INF_VERSION                    = 0x00010019
-  BASE_NAME                      = OemMiscLibHi1616Evb
+  BASE_NAME                      = HisiOemMiscLibHi1616Evb
   FILE_GUID                      = 751C7627-D5F8-499C-AEEEE-C87858759612
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = OemMiscLib
+  LIBRARY_CLASS                  = HisiOemMiscLib
 
 [Sources.common]
   BoardFeatureD05.c

diff --git a/...D05/Library/OemMiscLibD05/OemMiscLibD05.c → ...Library/HisiOemMiscLibD05/OemMiscLibD05.c b/...D05/Library/OemMiscLibD05/OemMiscLibD05.c → ...Library/HisiOemMiscLibD05/OemMiscLibD05.c
@@ -12,10 +12,10 @@
 
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/IoLib.h>
 #include <Library/LpcLib.h>
 #include <Library/OemAddressMapLib.h>
-#include <Library/OemMiscLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PlatformPciLib.h>
 #include <Library/PlatformSysCtrlLib.h>

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
@@ -57,7 +57,7 @@
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
   RtcHelperLib|Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf
   RealTimeClockLib|Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf
-  OemMiscLib|Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
+  HisiOemMiscLib|Platform/Hisilicon/D06/Library/HisiOemMiscLibD06/HisiOemMiscLibD06.inf
   OemAddressMapLib|Platform/Hisilicon/D06/Library/OemAddressMapD06/OemAddressMapD06.inf
   PlatformSysCtrlLib|Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf
 

diff --git a/...6/Library/OemMiscLibD06/BoardFeatureD06.c → ...brary/HisiOemMiscLibD06/BoardFeatureD06.c b/...6/Library/OemMiscLibD06/BoardFeatureD06.c → ...brary/HisiOemMiscLibD06/BoardFeatureD06.c
@@ -12,9 +12,9 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HiiLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/I2CLib.h>
 #include <Library/IoLib.h>
-#include <Library/OemMiscLib.h>
 #include <Protocol/Smbios.h>
 
 #include <PlatformArch.h>
@@ -416,7 +416,7 @@ OemGetPackages (
   return HiiAddPackages (
            &gEfiCallerIdGuid,
            NULL,
-           OemMiscLibStrings,
+           HisiOemMiscLibStrings,
            NULL,
            NULL
            );

diff --git a/.../OemMiscLibD06/BoardFeatureD06Strings.uni → ...iOemMiscLibD06/BoardFeatureD06Strings.uni b/.../OemMiscLibD06/BoardFeatureD06Strings.uni → ...iOemMiscLibD06/BoardFeatureD06Strings.uni
diff --git a/...6/Library/OemMiscLibD06/OemMiscLibD06.inf → ...y/HisiOemMiscLibD06/HisiOemMiscLibD06.inf b/...6/Library/OemMiscLibD06/OemMiscLibD06.inf → ...y/HisiOemMiscLibD06/HisiOemMiscLibD06.inf
@@ -9,11 +9,11 @@
 
 [Defines]
   INF_VERSION                    = 0x0001001A
-  BASE_NAME                      = OemMiscLib
+  BASE_NAME                      = HisiOemMiscLib
   FILE_GUID                      = 3002911C-C160-4C46-93BB-782846673EEA
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = OemMiscLib
+  LIBRARY_CLASS                  = HisiOemMiscLib
 
 [Sources.common]
   BoardFeatureD06.c

diff --git a/...D06/Library/OemMiscLibD06/OemMiscLibD06.c → ...Library/HisiOemMiscLibD06/OemMiscLibD06.c b/...D06/Library/OemMiscLibD06/OemMiscLibD06.c → ...Library/HisiOemMiscLibD06/OemMiscLibD06.c
@@ -12,10 +12,10 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/CpldD06.h>
 #include <Library/DebugLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/IoLib.h>
 #include <Library/LpcLib.h>
 #include <Library/OemAddressMapLib.h>
-#include <Library/OemMiscLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PlatformSysCtrlLib.h>
 #include <Library/SerialPortLib.h>

diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -11,9 +11,9 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/DevicePathLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/IoLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/OemMiscLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PciHostBridgeLib.h>
 #include <Library/PlatformPciLib.h>

diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -37,8 +37,8 @@
   BaseMemoryLib
   DebugLib
   DevicePathLib
+  HisiOemMiscLib
   MemoryAllocationLib
-  OemMiscLib
 
 [Pcd]
   gHisiTokenSpaceGuid.PcdPcieRootBridgeMask

diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
@@ -8,13 +8,13 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/HobLib.h>
 #include <Library/HwMemInitLib.h>
 #include <Library/OemConfigData.h>
-#include <Library/OemMiscLib.h>
 #include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
 
 #define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET)
 

diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h
@@ -25,6 +25,6 @@
 #include <Library/PrintLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 
 #endif
diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf
@@ -29,7 +29,7 @@
   DebugLib
   UefiLib
   UefiDriverEntryPoint
-  OemMiscLib
+  HisiOemMiscLib
 
 [Protocols]
   gEfiSmbiosProtocolGuid

diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h
@@ -30,7 +30,7 @@
 #include <Guid/DebugMask.h>
 #include <Guid/MemoryMapData.h>
 #include <Library/PlatformSysCtrlLib.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 
 //
 // This is the generated header file which includes whatever needs to be exported (strings + IFR)

diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h
@@ -25,7 +25,7 @@
 #include <Library/PcdLib.h>
 #include <PlatformArch.h>
 #include <Library/PlatformSysCtrlLib.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/ArmLib.h>
 
 //

diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
@@ -40,7 +40,7 @@
   PcdLib
 
   PlatformSysCtrlLib
-  OemMiscLib
+  HisiOemMiscLib
 
 [Protocols]
   gEfiSmbiosProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
@@ -62,7 +62,7 @@
   BaseMemoryLib
   BaseLib
   DebugLib
-  OemMiscLib
+  HisiOemMiscLib
   UefiBootServicesTableLib
   UefiRuntimeServicesTableLib
   UefiDriverEntryPoint

diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -11,7 +11,7 @@
 
 #include "SmbiosMisc.h"
 
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 
 extern SMBIOS_TABLE_TYPE9 MiscSystemSlotDesignationPcie0Data;
 extern SMBIOS_TABLE_TYPE9 MiscSystemSlotDesignationPcie1Data;

diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c
@@ -10,7 +10,7 @@
 #include "PcieInit.h"
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/PcdLib.h>
-#include <Library/OemMiscLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/PlatformPciLib.h>
 
 

diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf
@@ -36,7 +36,7 @@
   TimerLib
   PcdLib
   IoLib
-  OemMiscLib
+  HisiOemMiscLib
 
 [Protocols]
   #gEfiPcieRootBridgeProtocolGuid

diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c
@@ -10,8 +10,8 @@
 #include <Uefi.h>
 #include <IndustryStandard/Acpi.h>
 #include <Library/DebugLib.h>
+#include <Library/HisiOemMiscLib.h>
 #include <Library/IoLib.h>
-#include <Library/OemMiscLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PciExpressLib.h>
 #include <Library/PlatformPciLib.h>

diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec
@@ -49,7 +49,7 @@
   PlatformSysCtrlLib|Include/Library/PlatformSysCtrlLib.h
   CpldIoLib|Include/Library/CpldIoLib.h
   OemAddressMapLib|Include/Library/OemAddressMapLib.h
-  OemMiscLib|Include/Library/OemMiscLib.h
+  HisiOemMiscLib|Include/Library/HisiOemMiscLib.h
   I2CLib|Include/Library/I2CLib.h
   PlatformPciLib|Include/Library/PlatformPciLib.h
   FdtUpdateLib|Include/Library/FdtUpdateLib.h

diff --git a/...on/Hisilicon/Include/Library/OemMiscLib.h → ...isilicon/Include/Library/HisiOemMiscLib.h b/...on/Hisilicon/Include/Library/OemMiscLib.h → ...isilicon/Include/Library/HisiOemMiscLib.h
@@ -8,8 +8,8 @@
 **/
 
 
-#ifndef _OEM_MISC_LIB_H_
-#define _OEM_MISC_LIB_H_
+#ifndef HISI_OEM_MISC_LIB_H_
+#define HISI_OEM_MISC_LIB_H_
 
 #include <Uefi.h>