From c68fb69dfefa7a76ebad33674a49632c4f8c6926 Mon Sep 17 00:00:00 2001 From: Pierre Gondois Date: Mon, 11 Mar 2024 16:04:41 +0100 Subject: [PATCH] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg Following the discussion at [1] and as the ArmLib relies on them, move ArmPkg/Chipset/ArmV7[|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 Acked-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- 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 +- {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +- {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0 MdePkg/Include/Library/ArmLib.h | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h (94%) rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h (100%) diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c index ef6a132b8d..b0c2e39cd9 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c @@ -10,7 +10,7 @@ #include -#include +#include #include #include // for MAX_AARCH64_EXCEPTION diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S index cd9437b6aa..f5cbc2e97c 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -#include +#include #include #include #include // for exception type definitions diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c index 8728546587..6739f5c37d 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "AArch64Lib.h" #include "ArmLibPrivate.h" diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S index a7111e5188..177d10e66d 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -9,7 +9,7 @@ # #------------------------------------------------------------------------------ -#include +#include #include .set CTRL_M_BIT, (1 << 0) diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c index 9d9c623581..6a1f3f9477 100644 --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S index ffb643a56d..d0d6bc44f7 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S @@ -5,7 +5,7 @@ # # -#include +#include #include #include #include diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S index 2a604b719b..9b81b96a49 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S @@ -6,7 +6,7 @@ #======================================================================================= #include -#include +#include // Setup EL1 while in EL1 ASM_FUNC(SetupExceptionLevel1) diff --git a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c index 296b029e08..27a85049fa 100644 --- a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c +++ b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c @@ -8,7 +8,7 @@ #include "PrePi.h" -#include +#include VOID ArchInitialize ( diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c index a02c2ad560..a7f53132c7 100644 --- a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c +++ b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c @@ -8,7 +8,7 @@ #include "PrePi.h" -#include +#include VOID ArchInitialize ( diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/AArch64/AArch64.h similarity index 94% rename from ArmPkg/Include/Chipset/AArch64.h rename to MdePkg/Include/AArch64/AArch64.h index 5390bf0a27..a77c3a95f1 100644 --- a/ArmPkg/Include/Chipset/AArch64.h +++ b/MdePkg/Include/AArch64/AArch64.h @@ -10,7 +10,7 @@ #ifndef AARCH64_H_ #define AARCH64_H_ -#include +#include // 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/AArch64/AArch64Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/AArch64Mmu.h rename to MdePkg/Include/AArch64/AArch64Mmu.h diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h index 6aa8a48f07..852264dba2 100644 --- a/MdePkg/Include/Library/ArmLib.h +++ b/MdePkg/Include/Library/ArmLib.h @@ -16,7 +16,7 @@ #ifdef MDE_CPU_ARM #include #elif defined (MDE_CPU_AARCH64) - #include + #include #else #error "Unknown chipset." #endif