diff options
| author | Kun Qin <kuqin@microsoft.com> | 2025-04-07 12:29:22 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-04-10 17:52:48 +0000 |
| commit | 86099b948b6318b839bdbb41acad7211fadf5db8 (patch) | |
| tree | 504de0d8077d0016a532b85c9b35e088c795aea9 | |
| parent | 014689399fedc93908bca3909c4d55d6a0ca306c (diff) | |
| download | edk2-86099b948b6318b839bdbb41acad7211fadf5db8.zip edk2-86099b948b6318b839bdbb41acad7211fadf5db8.tar.gz edk2-86099b948b6318b839bdbb41acad7211fadf5db8.tar.bz2 | |
ArmPkg: ArmSmcLib: Move ArmSmcLib to MdePkg
As an implementation of an industry specification-defined interface,
ArmSmcLib is more appropriately placed in MdePkg.
This update relocates both the header definition and the implementation
of ArmSmcLib to MdePkg, thereby supporting the monitor call primitives
for all other packages that depend on this interface.
Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Kun Qin <kun.qin@microsoft.com>
| -rw-r--r-- | ArmPkg/ArmPkg.dec | 4 | ||||
| -rw-r--r-- | ArmPkg/ArmPkg.dsc | 3 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirt.dsc.inc | 2 | ||||
| -rw-r--r-- | EmbeddedPkg/EmbeddedPkg.dsc | 2 | ||||
| -rw-r--r-- | MdePkg/Include/Library/ArmSmcLib.h (renamed from ArmPkg/Include/Library/ArmSmcLib.h) | 0 | ||||
| -rw-r--r-- | MdePkg/Library/ArmSmcLib/AArch64/ArmSmc.S (renamed from ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S) | 0 | ||||
| -rw-r--r-- | MdePkg/Library/ArmSmcLib/Arm/ArmSmc.S (renamed from ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S) | 0 | ||||
| -rw-r--r-- | MdePkg/Library/ArmSmcLib/ArmSmc.c (renamed from ArmPkg/Library/ArmSmcLib/ArmSmc.c) | 0 | ||||
| -rw-r--r-- | MdePkg/Library/ArmSmcLib/ArmSmcLib.inf (renamed from ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf) | 1 | ||||
| -rw-r--r-- | MdePkg/MdePkg.dec | 4 | ||||
| -rw-r--r-- | MdePkg/MdePkg.dsc | 1 | ||||
| -rw-r--r-- | StandaloneMmPkg/StandaloneMmPkg.dsc | 2 | ||||
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadPkg.dsc | 2 |
13 files changed, 10 insertions, 11 deletions
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 78437b3..192fd36 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -50,10 +50,6 @@ #
ArmMtlLib|Include/Library/ArmMtlLib.h
- ## @libraryclass Provides a System Monitor Call (SMC) interface.
- #
- ArmSmcLib|Include/Library/ArmSmcLib.h
-
## @libraryclass Provides a SuperVisor Call (SVC) interface.
#
ArmSvcLib|Include/Library/ArmSvcLib.h
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 9090679..784218a 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -69,7 +69,7 @@ CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
@@ -134,7 +134,6 @@ ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
ArmPkg/Library/ArmHvcLibNull/ArmHvcLibNull.inf
ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
- ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
ArmPkg/Library/OpteeLib/OpteeLib.inf
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index f053f50..18f170e 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -109,7 +109,7 @@ CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index 5cc0bb7..2259c8f 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -124,7 +124,7 @@ ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
[LibraryClasses.ARM, LibraryClasses.AARCH64]
- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
diff --git a/ArmPkg/Include/Library/ArmSmcLib.h b/MdePkg/Include/Library/ArmSmcLib.h index be2f85a..be2f85a 100644 --- a/ArmPkg/Include/Library/ArmSmcLib.h +++ b/MdePkg/Include/Library/ArmSmcLib.h diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/MdePkg/Library/ArmSmcLib/AArch64/ArmSmc.S index 139bb89..139bb89 100644 --- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S +++ b/MdePkg/Library/ArmSmcLib/AArch64/ArmSmc.S diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/MdePkg/Library/ArmSmcLib/Arm/ArmSmc.S index 4b3d0db..4b3d0db 100644 --- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S +++ b/MdePkg/Library/ArmSmcLib/Arm/ArmSmc.S diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmc.c b/MdePkg/Library/ArmSmcLib/ArmSmc.c index 254507e..254507e 100644 --- a/ArmPkg/Library/ArmSmcLib/ArmSmc.c +++ b/MdePkg/Library/ArmSmcLib/ArmSmc.c diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/MdePkg/Library/ArmSmcLib/ArmSmcLib.inf index 6ce0ea4..4ae9740 100644 --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf +++ b/MdePkg/Library/ArmSmcLib/ArmSmcLib.inf @@ -24,4 +24,3 @@ [Packages]
MdePkg/MdePkg.dec
- ArmPkg/ArmPkg.dec
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 94fd1eb..2cfaa90 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -358,6 +358,10 @@ #
ArmLib|Include/Library/ArmLib.h
+ ## @libraryclass Provides an interface to Arm architecture monitor call functions.
+ #
+ ArmSmcLib|Include/Library/ArmSmcLib.h
+
[Guids]
#
# GUID defined in UEFI2.1/UEFI2.0/EFI1.1
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index 84730b0..65e333b 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -207,6 +207,7 @@ [Components.ARM, Components.AARCH64]
MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+ MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
[Components.RISCV64]
MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf
diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc index ab0443b..93d46a7 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -78,7 +78,7 @@ ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
StandaloneMmCoreEntryPoint|ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf
StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 29c9aba..3d0fd47 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -392,7 +392,7 @@ ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
- ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
|