ArmPkg: move RVCT PLATFORM_FLAGS override into ArmHvcLib/ArmSmcLib

[mirror_edk2.git] / ArmPkg / Library / ArmExceptionLib / ArmExceptionLib.c

diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
index 5977a3e8fae137dbbb9d085fdea112e659c16460..e8ea1f159d65f12da970c10ed2e410553198189d 100644 (file)
--- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
+++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c
@@ -26,6 +26,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/DefaultExceptionHandlerLib.h>\r
 \r
+STATIC\r
 RETURN_STATUS\r
 CopyExceptionHandlers(\r
   IN  PHYSICAL_ADDRESS        BaseAddress\r
@@ -66,9 +67,9 @@ extern UINTN                    gDebuggerNoHandlerValue;
 // library we cannot represent this in a PCD since PCDs are evaluated on\r
 // a per-module basis.\r
 #if defined(ARM_RELOCATE_VECTORS)\r
-BOOLEAN gArmRelocateVectorTable = TRUE;\r
+STATIC CONST BOOLEAN gArmRelocateVectorTable = TRUE;\r
 #else\r
-BOOLEAN gArmRelocateVectorTable = FALSE;\r
+STATIC CONST BOOLEAN gArmRelocateVectorTable = FALSE;\r
 #endif\r
 \r
 \r
@@ -102,7 +103,7 @@ InitializeCpuExceptionHandlers(
   // if we are requested to copy exceptin handlers to another location\r
   if (gArmRelocateVectorTable) {\r
 \r
-    VectorBase = PcdGet32(PcdCpuVectorBaseAddress);\r
+    VectorBase = PcdGet64(PcdCpuVectorBaseAddress);\r
     Status = CopyExceptionHandlers(VectorBase);\r
 \r
   }\r
@@ -117,7 +118,7 @@ InitializeCpuExceptionHandlers(
     // for encapsulated FVs.\r
     ASSERT(((UINTN)ExceptionHandlersStart & gExceptionVectorAlignmentMask) == 0);\r
 \r
-    // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector\r
+    // We do not copy the Exception Table at PcdGet64(PcdCpuVectorBaseAddress). We just set Vector\r
     // Base Address to point into CpuDxe code.\r
     VectorBase = (UINTN)ExceptionHandlersStart;\r
 \r
@@ -151,6 +152,7 @@ with default exception handlers.
 @retval EFI_UNSUPPORTED       This function is not supported.\r
 \r
 **/\r
+STATIC\r
 RETURN_STATUS\r
 CopyExceptionHandlers(\r
   IN  PHYSICAL_ADDRESS        BaseAddress\r