summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Lindholm <quic_llindhol@quicinc.com>2023-11-21 16:42:28 +0000
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-06-15 03:57:14 +0000
commitf2b9d5417dccf763bcbb68cd0effed0e25890aab (patch)
tree58c929b0f4af2b1fb9831e1bfc269ac10ae2ae18
parent5e776299a2604b336a947e68593012ab2cc16eb4 (diff)
downloadedk2-f2b9d5417dccf763bcbb68cd0effed0e25890aab.zip
edk2-f2b9d5417dccf763bcbb68cd0effed0e25890aab.tar.gz
edk2-f2b9d5417dccf763bcbb68cd0effed0e25890aab.tar.bz2
ArmPkg,MdePkg: move ArmLib.h to MdePkg
Related to https://bugzilla.tianocore.org/show_bug.cgi?id=4121, but not resolving it. (Nearly?) all of ArmPkg describes industry standard behaviour, and hence according to general rules, ought to live in MdePkg. Addressing this will however be a substantial task. Take a first step by moving the ArmLib interface definition to MdePkg, as discussed in https://edk2.groups.io/g/devel/topic/patch_v5_2_6/102725178 Continuous-integration-options: PatchCheck.ignore-multi-package Cc: Pierre Gondois <pierre.gondois@arm.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Sami Mujawar <sami.mujawar@arm.com> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
-rw-r--r--ArmPkg/ArmPkg.dec4
-rw-r--r--Maintainers.txt6
-rw-r--r--MdePkg/Include/Library/ArmLib.h (renamed from ArmPkg/Include/Library/ArmLib.h)0
-rw-r--r--MdePkg/MdePkg.dec5
4 files changed, 11 insertions, 4 deletions
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 7fe2b9b..4ce59f3 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -50,10 +50,6 @@
#
ArmHvcLib|Include/Library/ArmHvcLib.h
- ## @libraryclass Provides an interface to Arm registers.
- #
- ArmLib|Include/Library/ArmLib.h
-
## @libraryclass Provides a Mmu interface.
#
ArmMmuLib|Include/Library/ArmMmuLib.h
diff --git a/Maintainers.txt b/Maintainers.txt
index 274554a..6f91c21 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -461,6 +461,12 @@ F: MdePkg/Include/IndustryStandard/SpiNorFlashJedecSfdp.h
M: Abner Chang <abner.chang@amd.com> [changab]
R: Brit Chesley <brit.chesley@amd.com> [BritChesley]
+MdePkg: ARM/AARCH64 standard interfaces
+F: MdePkg/Include/Library/ArmLib.h
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
+R: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]
+
NetworkPkg
F: NetworkPkg/
W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
diff --git a/ArmPkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 6aa8a48..6aa8a48 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/MdePkg/Include/Library/ArmLib.h
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index bf94549..94170ff 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -339,6 +339,11 @@
## @libraryclass Provides function to make ecalls to SBI
BaseRiscVSbiLib|Include/Library/BaseRiscVSbiLib.h
+[LibraryClasses.ARM, LibraryClasses.AARCH64]
+ ## @libraryclass Provides an interface to Arm registers.
+ #
+ ArmLib|Include/Library/ArmLib.h
+
[Guids]
#
# GUID defined in UEFI2.1/UEFI2.0/EFI1.1