ARM Packages: Rename PcdNormal* into Pcd* PCDs

[mirror_edk2.git] / ArmPlatformPkg / Library / DebugSecExtraActionLib / DebugSecExtraActionLib.c

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 57390793f75d722cd053de4312ede53c05de6310..1c445667008169412a269b806710225decd24ca9 100755 (executable)
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -33,7 +33,7 @@ NonSecureWaitForFirmware (
   VOID (*secondary_start)(VOID);\r
 \r
   // The secondary cores will execute the firmware once wake from WFI.\r
-  secondary_start = (VOID (*)())PcdGet32(PcdNormalFvBaseAddress);\r
+  secondary_start = (VOID (*)())PcdGet32(PcdFvBaseAddress);\r
 \r
   ArmCallWFI();\r
 \r
@@ -65,7 +65,7 @@ ArmPlatformSecExtraAction (
 \r
   if (FeaturePcdGet (PcdStandalone) == FALSE) {\r
     if (IS_PRIMARY_CORE(MpId)) {\r
-      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdNormalFvBaseAddress);\r
+      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdFvBaseAddress);\r
 \r
       // Patch the DRAM to make an infinite loop at the start address\r
       *StartAddress = 0xEAFFFFFE; // opcode for while(1)\r
@@ -73,7 +73,7 @@ ArmPlatformSecExtraAction (
       CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Waiting for firmware at 0x%08X ...\n\r",StartAddress);\r
       SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
-      *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);\r
+      *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
     } else {\r
       // When the primary core is stopped by the hardware debugger to copy the firmware\r
       // into DRAM. The secondary cores are still running. As soon as the first bytes of\r
@@ -90,7 +90,7 @@ ArmPlatformSecExtraAction (
       ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);\r
 \r
       // To enter into Non Secure state, we need to make a return from exception\r
-      *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);\r
+      *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
     } else {\r
       // We wait for the primary core to finish to initialize the System Memory. Otherwise the secondary\r
       // cores would make crash the system by setting their stacks in DRAM before the primary core has not\r
@@ -98,6 +98,6 @@ ArmPlatformSecExtraAction (
       *JumpAddress = (UINTN)NonSecureWaitForFirmware;\r
     }\r
   } else {\r
-    *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);\r
+    *JumpAddress = PcdGet32(PcdFvBaseAddress);\r
   }\r
 }\r