| Message ID | 1470842282-8415-10-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 136df8b8b2bb012d76a188e055df016325788164 |
| Headers | show |
diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S index e5fbc86bc1c4..ba3d48f11f6d 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S @@ -14,16 +14,11 @@ #include <AsmMacroIoLibV8.h> -.text -.align 3 -GCC_ASM_EXPORT (ArmReadCpuExCr) -GCC_ASM_EXPORT (ArmWriteCpuExCr) - -ASM_PFX(ArmReadCpuExCr): +ASM_FUNC(ArmReadCpuExCr) mrs x0, S3_1_c15_c2_1 ret -ASM_PFX(ArmWriteCpuExCr): +ASM_FUNC(ArmWriteCpuExCr) msr S3_1_c15_c2_1, x0 dsb sy isb diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S index 5db586192206..365d57d7e8bd 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S @@ -12,17 +12,10 @@ // #include <AsmMacroIoLib.h> -#include <Library/ArmCpuLib.h> -#include <Chipset/ArmCortexA9.h> - -.text -.align 3 - -GCC_ASM_EXPORT(ArmGetScuBaseAddress) // IN None // OUT r0 = SCU Base Address -ASM_PFX(ArmGetScuBaseAddress): +ASM_FUNC(ArmGetScuBaseAddress) // Read Configuration Base Address Register. ArmCBar cannot be called to get // the Configuration BAR as a stack is not necessary setup. The SCU is at the // offset 0x0000 from the Private Memory Region.
Annotate functions with ASM_FUNC() so that they are emitted into separate sections. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S | 9 ++------- ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S | 9 +-------- 2 files changed, 3 insertions(+), 15 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel