UefiCpuPkg: Add CpuLib to module INFs that depend on UefiCpuLib.

There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
failure, add CpuLib dependency to all modules that depend on UefiCpuLib.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index f9e06b2fca4588c11808a8e85f5c9f2772f5d32b..a944c3d01cf72640b8bd126207612c836ecbaf69 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
@@ -21,6 +21,7 @@
 #include <Library/IoLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PcdLib.h>\r
+#include <Library/CpuLib.h>\r
 #include <Library/UefiCpuLib.h>\r
 \r
 //\r

diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
index 561baa44b0e6486f15fb8206b55e1a1edc4b6160..a85b69e0a11c351b6aa3e18e3d57ade2100ce4a5 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
@@ -38,6 +38,7 @@
   TimerLib\r
   IoLib\r
   PcdLib\r
+  CpuLib\r
   UefiCpuLib\r
 \r
 [Pcd]\r

diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
index f26d9c93894f6bcac1ec6a358b6879d90f47906b..1e45ffc3180e74d7aba4fbb5353835155ec77349 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
@@ -22,6 +22,7 @@
 #include <Library/IoLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PcdLib.h>\r
+#include <Library/CpuLib.h>\r
 #include <Library/UefiCpuLib.h>\r
 #include <IndustryStandard/Tdx.h>\r
 \r

diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
index 1e2a4f8b790f9b1c6b95eda9e80c889eac147e55..31ebdd39c61603b7c127468ff5ad64fe5ca4496e 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
@@ -38,6 +38,7 @@
   TimerLib\r
   IoLib\r
   PcdLib\r
+  CpuLib\r
   UefiCpuLib\r
 \r
 [Pcd]\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index aed872836c99db38b1f1ab415225eb85256c112f..dfeceec2aadcbb2d4098a2bcf0ec0a7b8cbcde1c 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -43,6 +43,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/LocalApicLib.h>\r
+#include <Library/CpuLib.h>\r
 #include <Library/UefiCpuLib.h>\r
 #include <Library/CpuExceptionHandlerLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r

diff --git a/UefiCpuPkg/SecCore/SecCore.inf b/UefiCpuPkg/SecCore/SecCore.inf
index ded83beb527245cc6907ae394c00db1e2fda22a6..f021997f271c99c26004085332924791c6399e16 100644 (file)
--- a/UefiCpuPkg/SecCore/SecCore.inf
+++ b/UefiCpuPkg/SecCore/SecCore.inf
@@ -47,6 +47,7 @@
   PlatformSecLib\r
   PcdLib\r
   DebugAgentLib\r
+  CpuLib\r
   UefiCpuLib\r
   PeCoffGetEntryPointLib\r
   PeCoffExtraActionLib\r

diff --git a/UefiCpuPkg/SecCore/SecCoreNative.inf b/UefiCpuPkg/SecCore/SecCoreNative.inf
index b528c5987947b0eff96f2205be1ec7ac7f9da019..e0a1b44a7e23721c7bd5993fa7013ab7f64da10b 100644 (file)
--- a/UefiCpuPkg/SecCore/SecCoreNative.inf
+++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
@@ -44,6 +44,7 @@
   PlatformSecLib\r
   PcdLib\r
   DebugAgentLib\r
+  CpuLib\r
   UefiCpuLib\r
   PeCoffGetEntryPointLib\r
   PeCoffExtraActionLib\r

diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h
index 029bee3e7e405104f9db1490d6c1d1c7dbb08c30..189fcf932625bd328025115594bab0364ffead4d 100644 (file)
--- a/UefiCpuPkg/SecCore/SecMain.h
+++ b/UefiCpuPkg/SecCore/SecMain.h
@@ -23,6 +23,7 @@
 #include <Library/PcdLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/PlatformSecLib.h>\r
+#include <Library/CpuLib.h>\r
 #include <Library/UefiCpuLib.h>\r
 #include <Library/PeCoffGetEntryPointLib.h>\r
 #include <Library/PeCoffExtraActionLib.h>\r