diff options
| author | Pierre Gondois <pierre.gondois@arm.com> | 2024-03-11 16:05:46 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-15 03:57:14 +0000 |
| commit | cf323e2839ce260fde43487baae205527dee1b2f (patch) | |
| tree | d8b68783f0dde2e51f828edbb13e03a15b341c85 | |
| parent | c68fb69dfefa7a76ebad33674a49632c4f8c6926 (diff) | |
| download | edk2-cf323e2839ce260fde43487baae205527dee1b2f.tar.gz edk2-cf323e2839ce260fde43487baae205527dee1b2f.tar.bz2 edk2-cf323e2839ce260fde43487baae205527dee1b2f.zip | |
ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|Mmu].h to MdePkg
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
Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
| -rw-r--r-- | ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c | 2 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c | 2 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c | 2 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 2 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S | 2 | ||||
| -rw-r--r-- | MdePkg/Include/Arm/AArch32.h (renamed from ArmPkg/Include/Chipset/ArmV7.h) | 2 | ||||
| -rw-r--r-- | MdePkg/Include/Arm/AArch32Mmu.h (renamed from ArmPkg/Include/Chipset/ArmV7Mmu.h) | 0 | ||||
| -rw-r--r-- | MdePkg/Include/Library/ArmLib.h | 2 |
9 files changed, 8 insertions, 8 deletions
diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c index fc411b845d..7652b97b43 100644 --- a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c +++ b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c @@ -11,7 +11,7 @@ #include <Uefi.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
#include <Library/ArmLib.h>
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c index 521d5be0de..6acc4d3e7c 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c @@ -13,7 +13,7 @@ #include <Library/ArmLib.h>
#include <Library/DebugLib.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
#include "ArmV7Lib.h"
#include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c index 52dbfd7140..bf3a874822 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c @@ -11,7 +11,7 @@ #include <Library/ArmLib.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
UINT32
ConvertSectionAttributesToPageAttributes (
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c index 28e4cd9f1a..60dc6c987c 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c @@ -8,7 +8,7 @@ **/
#include <Uefi.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
#include <Library/BaseMemoryLib.h>
#include <Library/CacheMaintenanceLib.h>
#include <Library/MemoryAllocationLib.h>
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c index 548ee13038..5e751cddd7 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c @@ -17,7 +17,7 @@ #include <Library/CacheMaintenanceLib.h>
#include <Library/MemoryAllocationLib.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
#define __EFI_MEMORY_RWX 0 // no restrictions
diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S index 6709dad0b9..60e530e4f1 100644 --- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S @@ -7,7 +7,7 @@ #include <AsmMacroIoLib.h>
-#include <Chipset/ArmV7.h>
+#include <Arm/AArch32.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Arm/AArch32.h index 94620c087d..e7e6e4dcd0 100644 --- a/ArmPkg/Include/Chipset/ArmV7.h +++ b/MdePkg/Include/Arm/AArch32.h @@ -10,7 +10,7 @@ #ifndef ARM_V7_H_
#define ARM_V7_H_
-#include <Chipset/ArmV7Mmu.h>
+#include <Arm/AArch32Mmu.h>
// ARM Interrupt ID in Exception Table
#define ARM_ARCH_EXCEPTION_IRQ EXCEPT_ARM_IRQ
diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/MdePkg/Include/Arm/AArch32Mmu.h index 89b81e33d0..89b81e33d0 100644 --- a/ArmPkg/Include/Chipset/ArmV7Mmu.h +++ b/MdePkg/Include/Arm/AArch32Mmu.h diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h index 852264dba2..71c2076652 100644 --- a/MdePkg/Include/Library/ArmLib.h +++ b/MdePkg/Include/Library/ArmLib.h @@ -14,7 +14,7 @@ #include <Uefi/UefiBaseType.h>
#ifdef MDE_CPU_ARM
- #include <Chipset/ArmV7.h>
+ #include <Arm/AArch32.h>
#elif defined (MDE_CPU_AARCH64)
#include <AArch64/AArch64.h>
#else
|