diff options
| author | Chao Li <lichao@loongson.cn> | 2024-03-20 14:52:05 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-04-16 06:00:32 +0000 |
| commit | 022ddb8f84af879c754f931f9912e1f743889990 (patch) | |
| tree | 634908b792a1fdc548bf98d821513568f82051bd | |
| parent | fecca982e3c8751a1e557e847b5824301c3b9141 (diff) | |
| download | edk2-022ddb8f84af879c754f931f9912e1f743889990.tar.gz edk2-022ddb8f84af879c754f931f9912e1f743889990.tar.bz2 edk2-022ddb8f84af879c754f931f9912e1f743889990.zip | |
UefiCpuPkg/MpInitLib: Reorder the INF files alphabetically
Some of the order is not in alphabetical, reorder.
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4726
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 29 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf | 25 |
2 files changed, 28 insertions, 26 deletions
diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf index 55e46d4a1f..7ef4c0d4db 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -23,21 +23,21 @@ [Sources.IA32]
Ia32/AmdSev.c
- Ia32/MpFuncs.nasm
Ia32/CreatePageTable.c
+ Ia32/MpFuncs.nasm
[Sources.X64]
X64/AmdSev.c
- X64/MpFuncs.nasm
X64/CreatePageTable.c
+ X64/MpFuncs.nasm
[Sources.common]
AmdSev.c
- MpEqu.inc
DxeMpLib.c
+ Microcode.c
+ MpEqu.inc
MpLib.c
MpLib.h
- Microcode.c
MpHandOff.h
[Packages]
@@ -47,17 +47,18 @@ [LibraryClasses]
BaseLib
+ CcExitLib
+ CpuLib
+ DebugAgentLib
+ HobLib
LocalApicLib
MemoryAllocationLib
- HobLib
+ MicrocodeLib
MtrrLib
- CpuLib
- UefiBootServicesTableLib
- DebugAgentLib
- SynchronizationLib
PcdLib
- CcExitLib
- MicrocodeLib
+ SynchronizationLib
+ UefiBootServicesTableLib
+
[LibraryClasses.X64]
CpuPageTableLib
@@ -70,6 +71,9 @@ gEdkiiMicrocodePatchHobGuid ## SOMETIMES_CONSUMES ## HOB
[Pcd]
+ gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES
+ gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES
+ gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds ## SOMETIMES_CONSUMES
@@ -82,6 +86,3 @@ gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase ## SOMETIMES_CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES
- gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf index bc3d716aa9..599ca36bc2 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf @@ -31,31 +31,34 @@ [Sources.common]
AmdSev.c
+ Microcode.c
MpEqu.inc
- PeiMpLib.c
MpLib.c
MpLib.h
- Microcode.c
MpHandOff.h
+ PeiMpLib.c
+
[Packages]
MdePkg/MdePkg.dec
- UefiCpuPkg/UefiCpuPkg.dec
MdeModulePkg/MdeModulePkg.dec
+ UefiCpuPkg/UefiCpuPkg.dec
[LibraryClasses]
BaseLib
+ CcExitLib
+ CpuLib
+ HobLib
LocalApicLib
MemoryAllocationLib
- HobLib
+ MicrocodeLib
MtrrLib
- CpuLib
- SynchronizationLib
- PeiServicesLib
PcdLib
- CcExitLib
- MicrocodeLib
+ PeiServicesLib
+ SynchronizationLib
[Pcd]
+ gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES
+ gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber ## CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds ## SOMETIMES_CONSUMES
@@ -66,9 +69,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOMETIMES_CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase ## SOMETIMES_CONSUMES
gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures ## CONSUMES
- gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES
- gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES
+ gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES
[Ppis]
gEdkiiPeiShadowMicrocodePpiGuid ## SOMETIMES_CONSUMES
|