[PATCH v1 01/15] IntelFsp2Pkg: Add CpuLib to module INFs that depend on UefiCpuLib


Yu Pu <yu.pu@...>
 

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: Chasel Chiu <chasel.chiu@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Star Zeng <star.zeng@...>
Signed-off-by: Yu Pu <yu.pu@...>
---
IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 1 +
IntelFsp2Pkg/FspSecCore/SecMain.h | 1 +
2 files changed, 2 insertions(+)

diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf b/IntelFsp2Pkg/FspSecC=
ore/FspSecCoreM.inf
index 7b05cae64130..830471adcf2f 100644
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
@@ -51,6 +51,7 @@
FspSwitchStackLib=0D
FspCommonLib=0D
FspSecPlatformLib=0D
+ CpuLib=0D
UefiCpuLib=0D
=0D
[Pcd]=0D
diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h b/IntelFsp2Pkg/FspSecCore/Se=
cMain.h
index 7794255af13d..edb7447d9eff 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.h
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
@@ -20,6 +20,7 @@
#include <Library/SerialPortLib.h>=0D
#include <Library/FspSwitchStackLib.h>=0D
#include <Library/FspCommonLib.h>=0D
+#include <Library/CpuLib.h>=0D
#include <Library/UefiCpuLib.h>=0D
#include <FspEas.h>=0D
=0D
--=20
2.30.0.windows.2


Chiu, Chasel
 

Reviewed-by: Chasel Chiu <chasel.chiu@...>

Thanks,
Chasel

-----Original Message-----
From: Pu, Yu <yu.pu@...>
Sent: Monday, April 11, 2022 5:46 PM
To: devel@edk2.groups.io
Cc: Pu, Yu <yu.pu@...>; Chiu, Chasel <chasel.chiu@...>;
Desimone, Nathaniel L <nathaniel.l.desimone@...>; Zeng, Star
<star.zeng@...>
Subject: [PATCH v1 01/15] IntelFsp2Pkg: 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: Chasel Chiu <chasel.chiu@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Star Zeng <star.zeng@...>
Signed-off-by: Yu Pu <yu.pu@...>
---
IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 1 +
IntelFsp2Pkg/FspSecCore/SecMain.h | 1 +
2 files changed, 2 insertions(+)

diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
index 7b05cae64130..830471adcf2f 100644
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
@@ -51,6 +51,7 @@
FspSwitchStackLib FspCommonLib FspSecPlatformLib+ CpuLib
UefiCpuLib [Pcd]diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h
b/IntelFsp2Pkg/FspSecCore/SecMain.h
index 7794255af13d..edb7447d9eff 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.h
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
@@ -20,6 +20,7 @@
#include <Library/SerialPortLib.h> #include <Library/FspSwitchStackLib.h>
#include <Library/FspCommonLib.h>+#include <Library/CpuLib.h> #include
<Library/UefiCpuLib.h> #include <FspEas.h> --
2.30.0.windows.2