I think it would be simpler to add the CpuLib mapping to MdePkg/MdeLibs.dsc.inc
All packages should already be including this file, so one change here removes
the need to modify all the individual DSC files.
Mike
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yu Pu
> Sent: Wednesday, March 23, 2022 4:48 AM
> To: devel@edk2.groups.io
> Cc: Pu, Yu <yu.pu@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng,
> Star <star.zeng@intel.com>
> Subject: [edk2-devel] [PATCH v1 01/17] IntelFsp2Pkg: Add CpuLib to module INFs that depend on UefiCpuLib.
>
> Step 1 to merge UefiCpuLib to CpuLib
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Yu Pu <yu.pu@intel.com>
> ---
> IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 1 +
> IntelFsp2Pkg/FspSecCore/SecMain.h | 1 +
> IntelFsp2Pkg/IntelFsp2Pkg.dsc | 1 +
> 3 files changed, 3 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>
>
>
>
> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> index c1414f7e75b8..b7d20adef5a2 100644
> --- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> @@ -27,6 +27,7 @@
> PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
>
> IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
>
> UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
>
> + CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
>
> UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
>
>
>
> ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
>
> --
> 2.30.0.windows.2
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#87917): https://edk2.groups.io/g/devel/message/87917
> Mute This Topic: https://groups.io/mt/89988790/1643496
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
> -=-=-=-=-=-=
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#87934): https://edk2.groups.io/g/devel/message/87934
Mute This Topic: https://groups.io/mt/89988790/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-