ARM: Remove NSACR from the common code

[mirror_edk2.git] / ArmPkg / Library / ArmLib / Common / Arm / ArmLibSupport.asm

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index fd0f332bd65c3ce86ea7d1ff175bdc192ec28915..f4b22943ff2c5012c988e959447d6f3e6fc811cf 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------ \r
 //\r
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-// Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+// Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
@@ -38,12 +38,12 @@
     EXPORT ArmReadAuxCr\r
     EXPORT ArmInvalidateTlb\r
     EXPORT ArmUpdateTranslationTableEntry\r
-    EXPORT ArmReadNsacr\r
-    EXPORT ArmWriteNsacr\r
     EXPORT ArmReadScr\r
     EXPORT ArmWriteScr\r
     EXPORT ArmReadMVBar\r
     EXPORT ArmWriteMVBar\r
+    EXPORT ArmReadHVBar\r
+    EXPORT ArmWriteHVBar\r
     EXPORT ArmCallWFE\r
     EXPORT ArmCallSEV\r
     EXPORT ArmReadSctlr\r
@@ -145,14 +145,6 @@ ArmInvalidateTlb
   isb\r
   bx      lr\r
 \r
-ArmReadNsacr\r
-  mrc     p15, 0, r0, c1, c1, 2\r
-  bx      lr\r
-\r
-ArmWriteNsacr\r
-  mcr     p15, 0, r0, c1, c1, 2\r
-  bx      lr\r
-\r
 ArmReadScr\r
   mrc     p15, 0, r0, c1, c1, 0\r
   bx      lr\r
@@ -161,6 +153,14 @@ ArmWriteScr
   mcr     p15, 0, r0, c1, c1, 0\r
   bx      lr\r
 \r
+ArmReadHVBar\r
+  mrc     p15, 4, r0, c12, c0, 0\r
+  bx      lr\r
+\r
+ArmWriteHVBar\r
+  mcr     p15, 4, r0, c12, c0, 0\r
+  bx      lr\r
+\r
 ArmReadMVBar\r
   mrc     p15, 0, r0, c12, c0, 1\r
   bx      lr\r