[edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg

["PierreGondois" <pierre.gondois@arm.com>]

Following the discussion at [1] and as the ArmLib relies on them,
move ArmPkg/Chipset/AArch64[|Mmu].h files to the MdePkg.

Update the path to correctly include the moved files.

[1] https://edk2.groups.io/g/devel/message/111566

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c       | 2 +-
 ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S       | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                      | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                  | 2 +-
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c                | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                   | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                      | 2 +-
 ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                        | 2 +-
 ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                            | 2 +-
 MdePkg/Include/Library/ArmLib.h                                 | 2 +-
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h       | 2 +-
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h    | 0
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)

diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
index ef6a132b8dfc..16eb51c6eb81 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
@@ -10,7 +10,7 @@
 
 #include <Uefi.h>
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Protocol/DebugSupport.h> // for MAX_AARCH64_EXCEPTION
 
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
index cd9437b6aab8..6f67e2557654 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
@@ -7,7 +7,7 @@
 //
 //------------------------------------------------------------------------------
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/PcdLib.h>
 #include <AsmMacroIoLibV8.h>
 #include <Protocol/DebugSupport.h> // for exception type definitions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
index 87285465871d..8afae1464f70 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
@@ -13,7 +13,7 @@
 #include <Library/ArmLib.h>
 #include <Library/DebugLib.h>
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 #include "AArch64Lib.h"
 #include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index a7111e51882c..4bdfa7ac2ccb 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -9,7 +9,7 @@
 #
 #------------------------------------------------------------------------------
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <AsmMacroIoLibV8.h>
 
 .set CTRL_M_BIT,      (1 << 0)
diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index 9d9c623581fe..6833015ff93f 100644
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -11,7 +11,7 @@
 
 #include <Uefi.h>
 #include <Pi/PiMultiPhase.h>
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/MemoryAllocationLib.h>
diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
index ffb643a56df0..36105e31800f 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
@@ -5,7 +5,7 @@
 #
 #
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <AsmMacroIoLibV8.h>
 #include <Base.h>
 #include <AutoGen.h>
diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
index 2a604b719b26..a956b4d99634 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
@@ -6,7 +6,7 @@
 #=======================================================================================
 
 #include <AsmMacroIoLibV8.h>
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 // Setup EL1 while in EL1
 ASM_FUNC(SetupExceptionLevel1)
diff --git a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
index 296b029e08bf..a315413a9944 100644
--- a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
@@ -8,7 +8,7 @@
 
 #include "PrePi.h"
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 VOID
 ArchInitialize (
diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
index 9cab88ca086e..f4487b6a5197 100644
--- a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
@@ -8,7 +8,7 @@
 
 #include "PrePi.h"
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 VOID
 ArchInitialize (
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 6aa8a48f07f3..552ae3684b93 100644
--- a/MdePkg/Include/Library/ArmLib.h
+++ b/MdePkg/Include/Library/ArmLib.h
@@ -16,7 +16,7 @@
 #ifdef MDE_CPU_ARM
   #include <Chipset/ArmV7.h>
 #elif defined (MDE_CPU_AARCH64)
-  #include <Chipset/AArch64.h>
+  #include <Register/AArch64/AArch64.h>
 #else
   #error "Unknown chipset."
 #endif
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/Register/AArch64/AArch64.h
similarity index 94%
rename from ArmPkg/Include/Chipset/AArch64.h
rename to MdePkg/Include/Register/AArch64/AArch64.h
index 5390bf0a2774..7d894fa8a0fc 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/MdePkg/Include/Register/AArch64/AArch64.h
@@ -10,7 +10,7 @@
 #ifndef AARCH64_H_
 #define AARCH64_H_
 
-#include <Chipset/AArch64Mmu.h>
+#include <Register/AArch64/AArch64Mmu.h>
 
 // ARM Interrupt ID in Exception Table
 #define ARM_ARCH_EXCEPTION_IRQ  EXCEPT_AARCH64_IRQ
diff --git a/ArmPkg/Include/Chipset/AArch64Mmu.h b/MdePkg/Include/Register/AArch64/AArch64Mmu.h
similarity index 100%
rename from ArmPkg/Include/Chipset/AArch64Mmu.h
rename to MdePkg/Include/Register/AArch64/AArch64Mmu.h
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116760): https://edk2.groups.io/g/devel/message/116760
Mute This Topic: https://groups.io/mt/104927820/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-