summaryrefslogtreecommitdiffstats
path: root/ArmPlatformPkg
diff options
context:
space:
mode:
authorOliver Smith-Denny <osde@linux.microsoft.com>2024-08-06 15:19:23 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-09-12 19:36:59 +0000
commit734e71f428a4fdac5d82ae9c093911053356f6ff (patch)
tree3af3c3f9e329b079b8ccd28a3992d610ebafde61 /ArmPlatformPkg
parent656665d289b355ada71ad718759200c44c655264 (diff)
downloadedk2-734e71f428a4fdac5d82ae9c093911053356f6ff.tar.gz
edk2-734e71f428a4fdac5d82ae9c093911053356f6ff.tar.bz2
edk2-734e71f428a4fdac5d82ae9c093911053356f6ff.zip
MdePkg: Move AsmMacroIoLib*.h from ArmPkg
AsmMacroIoLib.h and AsmMacroIoLibV8.h are used by the CompilerIntrinsicsLib, which is moving to MdePkg. These functions provide standard definitions for ARM/AARCH64 assembly code, respectively, and so are moved to the arch directories in MdePkg to avoid MdePkg having a dependency on ArmPkg. Now that the files are in Arm/ and AArch64/ directories, the filenames are changed to AsmMacroLib.h as we can distinguish the architecture from the path. AsmMacroIoLib.inc is unused and so is removed. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
Diffstat (limited to 'ArmPlatformPkg')
-rw-r--r--ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S2
-rw-r--r--ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S2
-rw-r--r--ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S2
-rw-r--r--ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S2
-rw-r--r--ArmPlatformPkg/Sec/AArch64/Exception.S2
-rw-r--r--ArmPlatformPkg/Sec/AArch64/Helper.S2
-rw-r--r--ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S2
-rw-r--r--ArmPlatformPkg/Sec/AArch64/SwitchStack.S2
-rw-r--r--ArmPlatformPkg/Sec/Arm/Exception.S2
-rw-r--r--ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S2
-rw-r--r--ArmPlatformPkg/Sec/Arm/SwitchStack.S2
11 files changed, 11 insertions, 11 deletions
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
index 1eeb7fed6f..873729343c 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <Library/ArmLib.h>
ASM_FUNC(ArmPlatformPeiBootAction)
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
index 342d6d5e0a..0e11c34af5 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Library/ArmLib.h>
ASM_FUNC(ArmPlatformPeiBootAction)
diff --git a/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S
index efb6c5ade9..7263ee9374 100644
--- a/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S
index ab5b023fa9..fc28939afe 100644
--- a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Arm/AArch32.h>
diff --git a/ArmPlatformPkg/Sec/AArch64/Exception.S b/ArmPlatformPkg/Sec/AArch64/Exception.S
index d0d6bc44f7..433761e3eb 100644
--- a/ArmPlatformPkg/Sec/AArch64/Exception.S
+++ b/ArmPlatformPkg/Sec/AArch64/Exception.S
@@ -6,7 +6,7 @@
#
#include <AArch64/AArch64.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <Base.h>
#include <AutoGen.h>
diff --git a/ArmPlatformPkg/Sec/AArch64/Helper.S b/ArmPlatformPkg/Sec/AArch64/Helper.S
index 9b81b96a49..c784c4a1cd 100644
--- a/ArmPlatformPkg/Sec/AArch64/Helper.S
+++ b/ArmPlatformPkg/Sec/AArch64/Helper.S
@@ -5,7 +5,7 @@
#
#=======================================================================================
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <AArch64/AArch64.h>
// Setup EL1 while in EL1
diff --git a/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S
index 7addae6cff..154be1111d 100644
--- a/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/Sec/AArch64/SwitchStack.S b/ArmPlatformPkg/Sec/AArch64/SwitchStack.S
index 308b8764fc..7074040435 100644
--- a/ArmPlatformPkg/Sec/AArch64/SwitchStack.S
+++ b/ArmPlatformPkg/Sec/AArch64/SwitchStack.S
@@ -8,7 +8,7 @@
#
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#/**
# This allows the caller to switch the stack and return
diff --git a/ArmPlatformPkg/Sec/Arm/Exception.S b/ArmPlatformPkg/Sec/Arm/Exception.S
index 956ae84714..364b512604 100644
--- a/ArmPlatformPkg/Sec/Arm/Exception.S
+++ b/ArmPlatformPkg/Sec/Arm/Exception.S
@@ -5,7 +5,7 @@
#
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Base.h>
#include <AutoGen.h>
diff --git a/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S
index b3c67234e9..1207497dc7 100644
--- a/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/Sec/Arm/SwitchStack.S b/ArmPlatformPkg/Sec/Arm/SwitchStack.S
index d64772b8ed..028ee26e89 100644
--- a/ArmPlatformPkg/Sec/Arm/SwitchStack.S
+++ b/ArmPlatformPkg/Sec/Arm/SwitchStack.S
@@ -6,7 +6,7 @@
#
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#/**
# This allows the caller to switch the stack and return