Skip to content

Commit a492423

Browse files
AjanZhongAjanZhong
committed
ArmPkg,MdePkg: Move CpuDxe from ArmPkg to CpuDxeArm in UefiCpuPkg
Move CpuDxe from ArmPkg to CpuDxeArm in UefiCpuPkg as discussed in: https://edk2.groups.io/g/devel/topic/patch_v5_2_6/102725178 Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Ajan Zhong <[email protected]>
1 parent 6ed19b9 commit a492423

21 files changed

+15
-15
lines changed

Diff for: ‎ArmPkg/ArmPkg.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
117117
ArmPkg/Library/SemihostLib/SemihostLib.inf
118118

119-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
120119
ArmPkg/Drivers/CpuPei/CpuPei.inf
121120
ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf
122121
ArmPkg/Drivers/ArmGicDxe/ArmGicV2Dxe.inf

Diff for: ‎ArmVirtPkg/ArmVirtCloudHv.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
#
245245
# Architectural Protocols
246246
#
247-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
247+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
248248
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
249249
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
250250
<LibraryClasses>

Diff for: ‎ArmVirtPkg/ArmVirtCloudHv.fdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ READ_LOCK_STATUS = TRUE
112112
#
113113
# PI DXE Drivers producing Architectural Protocols (EFI Services)
114114
#
115-
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
115+
INF UefiCpuPkg/CpuDxeArm/CpuDxe.inf
116116
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
117117
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
118118
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

Diff for: ‎ArmVirtPkg/ArmVirtKvmTool.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
#
270270
# Architectural Protocols
271271
#
272-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
272+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
273273
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
274274
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
275275
<LibraryClasses>

Diff for: ‎ArmVirtPkg/ArmVirtKvmTool.fdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ READ_LOCK_STATUS = TRUE
127127
#
128128
# PI DXE Drivers producing Architectural Protocols (EFI Services)
129129
#
130-
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
130+
INF UefiCpuPkg/CpuDxeArm/CpuDxe.inf
131131
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
132132
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
133133
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

Diff for: ‎ArmVirtPkg/ArmVirtQemu.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
#
381381
# Architectural Protocols
382382
#
383-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
383+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
384384
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
385385
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
386386
<LibraryClasses>

Diff for: ‎ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ READ_LOCK_STATUS = TRUE
4747
#
4848
# PI DXE Drivers producing Architectural Protocols (EFI Services)
4949
#
50-
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
50+
INF UefiCpuPkg/CpuDxeArm/CpuDxe.inf
5151
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
5252
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
5353
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

Diff for: ‎ArmVirtPkg/ArmVirtQemuKernel.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
#
304304
# Architectural Protocols
305305
#
306-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
306+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
307307
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
308308
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
309309
<LibraryClasses>

Diff for: ‎ArmVirtPkg/ArmVirtXen.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
#
173173
# Architectural Protocols
174174
#
175-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
175+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
176176
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
177177
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
178178
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

Diff for: ‎ArmVirtPkg/ArmVirtXen.fdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ READ_LOCK_STATUS = TRUE
144144
#
145145
# PI DXE Drivers producing Architectural Protocols (EFI Services)
146146
#
147-
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
147+
INF UefiCpuPkg/CpuDxeArm/CpuDxe.inf
148148
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
149149
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
150150
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

Diff for: ‎ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c renamed to ‎UefiCpuPkg/CpuDxeArm/AArch64/Mmu.c

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/Arm/Mmu.c renamed to ‎UefiCpuPkg/CpuDxeArm/Arm/Mmu.c

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/CpuDxe.c renamed to ‎UefiCpuPkg/CpuDxeArm/CpuDxe.c

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/CpuDxe.h renamed to ‎UefiCpuPkg/CpuDxeArm/CpuDxe.h

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/CpuDxe.inf renamed to ‎UefiCpuPkg/CpuDxeArm/CpuDxe.inf

-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
AArch64/Mmu.c
3333

3434
[Packages]
35-
ArmPkg/ArmPkg.dec
3635
MdePkg/MdePkg.dec
3736
MdeModulePkg/MdeModulePkg.dec
3837

@@ -58,7 +57,6 @@
5857

5958
[Guids]
6059
gEfiDebugImageInfoTableGuid
61-
gArmMpCoreInfoGuid
6260
gIdleLoopEventGuid
6361
gEfiVectorHandoffTableGuid
6462

@@ -69,6 +67,5 @@
6967
[FeaturePcd.common]
7068
gEfiMdePkgTokenSpaceGuid.PcdRemapUnusedMemoryNx
7169

72-
7370
[Depex]
7471
TRUE

Diff for: ‎ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c renamed to ‎UefiCpuPkg/CpuDxeArm/CpuMmuCommon.c

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/Exception.c renamed to ‎UefiCpuPkg/CpuDxeArm/Exception.c

File renamed without changes.

Diff for: ‎ArmPkg/Drivers/CpuDxe/MemoryAttribute.c renamed to ‎UefiCpuPkg/CpuDxeArm/MemoryAttribute.c

File renamed without changes.

Diff for: ‎UefiCpuPkg/UefiCpuPkg.dsc

+4
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,11 @@
228228
UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf
229229
UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf
230230

231+
[Components.ARM]
232+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
233+
231234
[Components.AARCH64]
235+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
232236
UefiCpuPkg/Library/BaseArchSupportLib/BaseArchSupportLib.inf
233237

234238
[Components.ARM, Components.AARCH64]

Diff for: ‎UefiPayloadPkg/UefiPayloadPkg.dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@
11281128

11291129
[Components.AARCH64]
11301130
ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
1131-
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
1131+
UefiCpuPkg/CpuDxeArm/CpuDxe.inf
11321132
UefiCpuPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
11331133

11341134
EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

Diff for: ‎UefiPayloadPkg/UefiPayloadPkg.fdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntime
171171
INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
172172
!endif
173173
!elseif "AARCH64" IN "$(ARCH)"
174-
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
174+
INF UefiCpuPkg/CpuDxeArm/CpuDxe.inf
175175
INF ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf
176176
INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
177177

0 commit comments

Comments
 (0)