diff options
-rw-r--r-- | ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c | 2 | ||||
-rw-r--r-- | ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S | 2 | ||||
-rw-r--r-- | ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c | 2 | ||||
-rw-r--r-- | ArmPkg/Library/ArmLib/AArch64/AArch64Support.S | 2 | ||||
-rw-r--r-- | ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 2 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 2 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePeiCore/AArch64/Helper.S | 2 | ||||
-rw-r--r-- | ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c | 2 | ||||
-rw-r--r-- | ArmVirtPkg/PrePi/AArch64/ArchPrePi.c | 2 | ||||
-rw-r--r-- | MdePkg/Include/AArch64/AArch64.h (renamed from ArmPkg/Include/Chipset/AArch64.h) | 2 | ||||
-rw-r--r-- | MdePkg/Include/AArch64/AArch64Mmu.h (renamed from ArmPkg/Include/Chipset/AArch64Mmu.h) | 0 | ||||
-rw-r--r-- | MdePkg/Include/Library/ArmLib.h | 2 |
12 files changed, 11 insertions, 11 deletions
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c index ef6a132..b0c2e39 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 <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 cd9437b..f5cbc2e 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S @@ -7,7 +7,7 @@ //
//------------------------------------------------------------------------------
-#include <Chipset/AArch64.h>
+#include <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 8728546..6739f5c 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 <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 a7111e5..177d10e 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -9,7 +9,7 @@ #
#------------------------------------------------------------------------------
-#include <Chipset/AArch64.h>
+#include <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 9d9c623..6a1f3f9 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 <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 ffb643a..d0d6bc4 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S @@ -5,7 +5,7 @@ #
#
-#include <Chipset/AArch64.h>
+#include <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 2a604b7..9b81b96 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 <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 296b029..27a8504 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 <AArch64/AArch64.h>
VOID
ArchInitialize (
diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c index a02c2ad..a7f5313 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 <AArch64/AArch64.h>
VOID
ArchInitialize (
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/AArch64/AArch64.h index 5390bf0..a77c3a9 100644 --- a/ArmPkg/Include/Chipset/AArch64.h +++ b/MdePkg/Include/AArch64/AArch64.h @@ -10,7 +10,7 @@ #ifndef AARCH64_H_
#define AARCH64_H_
-#include <Chipset/AArch64Mmu.h>
+#include <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/AArch64/AArch64Mmu.h index 2ea2cc0..2ea2cc0 100644 --- a/ArmPkg/Include/Chipset/AArch64Mmu.h +++ b/MdePkg/Include/AArch64/AArch64Mmu.h diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h index 6aa8a48..852264d 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 <AArch64/AArch64.h>
#else
#error "Unknown chipset."
#endif
|