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 Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Sami Mujawar <sami.muja...@arm.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang....@intel.com> Signed-off-by: Pierre Gondois <pierre.gond...@arm.com> --- ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c | 2 +- ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c | 2 +- ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S | 2 +- MdePkg/Include/Library/ArmLib.h | 2 +- .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h | 2 +- .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%) rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%) diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c index fc411b845d64..a3e12b73b602 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 <Register/Arm/AArch32.h> #include <Library/ArmLib.h> diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c index 521d5be0de33..0ba823457c58 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 <Register/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 52dbfd714029..c17e1203be91 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 <Register/Arm/AArch32.h> UINT32 ConvertSectionAttributesToPageAttributes ( diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c index 28e4cd9f1a77..d4df07514066 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 <Register/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 548ee1303870..7655cb4152de 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 <Register/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 6709dad0b9d1..bfe314ae2e3d 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 <Register/Arm/AArch32.h> ASM_FUNC(_ModuleEntryPoint) // Do early platform specific actions diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h index 552ae3684b93..70ca6ce63842 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 <Register/Arm/AArch32.h> #elif defined (MDE_CPU_AARCH64) #include <Register/AArch64/AArch64.h> #else diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Register/Arm/AArch32.h similarity index 94% rename from ArmPkg/Include/Chipset/ArmV7.h rename to MdePkg/Include/Register/Arm/AArch32.h index 94620c087df2..e74e1e2bf833 100644 --- a/ArmPkg/Include/Chipset/ArmV7.h +++ b/MdePkg/Include/Register/Arm/AArch32.h @@ -10,7 +10,7 @@ #ifndef ARM_V7_H_ #define ARM_V7_H_ -#include <Chipset/ArmV7Mmu.h> +#include <Register/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/Register/Arm/AArch32Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/ArmV7Mmu.h rename to MdePkg/Include/Register/Arm/AArch32Mmu.h -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116761): https://edk2.groups.io/g/devel/message/116761 Mute This Topic: https://groups.io/mt/104927824/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
