ArmPkg: Added Aarch64 support

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Harry Liebel <Harry.Liebel@arm.com>
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14486 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 2 deletions

diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
index 8c1fe415dc..970bde34cd 100644
--- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
+++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
@@ -19,7 +19,7 @@
 #include <Library/TimerLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PcdLib.h>

-#include <Library/ArmV7ArchTimerLib.h>

+#include <Library/ArmArchTimerLib.h>

 #include <Chipset/ArmV7.h>

 

 #define TICKS_PER_MICRO_SEC     (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)

@@ -43,15 +43,18 @@ TimerConstructor (
     // manual lower bound of the frequency is in the range of 1-10MHz

     ASSERT (TICKS_PER_MICRO_SEC);

 

+#ifdef MDE_CPU_ARM

+    // Only set the frequency for ARMv7. We expect the secure firmware to have already do it

     // If the security extensions are not implemented set Timer Frequency

     if ((ArmReadIdPfr1 () & 0xF0) == 0x0) {

       ArmArchTimerSetTimerFreq (PcdGet32 (PcdArmArchTimerFreqInHz));

     }

+#endif

 

     // Architectural Timer Frequency must be set in the Secure privileged(if secure extensions are supported) mode.

     // If the reset value (0) is returned just ASSERT.

     TimerFreq = ArmArchTimerGetTimerFreq ();

-    ASSERT (TimerFreq);

+    ASSERT (TimerFreq != 0);

 

   } else {

     DEBUG ((EFI_D_ERROR, "ARM Architectural Timer is not available in the CPU, hence this library can not be used.\n"));