Integrate UefiCpuLib breaking change

Updates the repo for a change that merged UefiCpuLib with CpuLib. UefiCpuLib will be removed entirely soon so all references are updated to CpuLib. Includes the following submodule updates: - `MU_BASECORE` to `v2023020005.0.1` - `Common/MU` to `v2023020001.4.1` - `Common/MU_TIANO` to `v2023020001.4.1` - `Features/MM_SUPV` to `v8.1.5` Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
microsoft · Aug 30, 2023 · 384774b · 384774b
1 parent 8f47736
commit 384774b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/Common/MU b/Common/MU
diff --git a/Common/MU_TIANO b/Common/MU_TIANO
diff --git a/Features/MM_SUPV b/Features/MM_SUPV
diff --git a/MU_BASECORE b/MU_BASECORE
diff --git a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c
@@ -12,7 +12,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
-#include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Register/Intel/Cpuid.h>
 
 #define MAX_MESSAGE_LENGTH  64

diff --git a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf
@@ -15,7 +15,7 @@
   ENTRY_POINT       = CpuInfoDxeEntryPoint
 
 [Sources]
-  CpuInfoDxe.c 
+  CpuInfoDxe.c
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -28,7 +28,7 @@
   UefiLib
   BaseLib
   PrintLib
-  UefiCpuLib
+  CpuLib
   UefiDriverEntryPoint
   UefiBootServicesTableLib
 

diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
@@ -144,7 +144,6 @@
 
   # CPU/SMBUS/Peripherals Libraries
   CpuLib              |MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  UefiCpuLib          |UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SynchronizationLib  |MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   LocalApicLib        |UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
   SmbusLib            |MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

diff --git a/Platforms/QemuQ35Pkg/Sec/SecMain.c b/Platforms/QemuQ35Pkg/Sec/SecMain.c
@@ -17,7 +17,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PcdLib.h>
-#include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeCoffLib.h>

diff --git a/Platforms/QemuQ35Pkg/Sec/SecMain.inf b/Platforms/QemuQ35Pkg/Sec/SecMain.inf
@@ -45,7 +45,7 @@
   BaseMemoryLib
   PeiServicesLib
   PcdLib
-  UefiCpuLib
+  CpuLib
   DebugAgentLib
   IoLib
   PeCoffLib