ARM Packages: Rename PcdNormal* into Pcd* PCDs

The denomination 'Normal' was used to make reference to the 'Normal'
or 'Non Secure' or 'Non Trusted' world.
To avoid confusion, this prefix has been removed from PCDs to define
the normal world.

The PCDs explicitely related to the Secure/Trusted World continue to
have the 'Sec' prefix.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12416 6f19259b-4bc3-4df7-8a09-765794883524

32 files changed, 84 insertions, 84 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 65a9757..ea79b08 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -86,10 +86,10 @@
   #

   # ARM Normal (or Non Secure) Firmware PCDs

   #

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0|UINT32|0x0000002B

-  gArmTokenSpaceGuid.PcdNormalFdSize|0|UINT32|0x0000002C

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress|0|UINT32|0x0000002D

-  gArmTokenSpaceGuid.PcdNormalFvSize|0|UINT32|0x0000002E

+  gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT32|0x0000002B

+  gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C

+  gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT32|0x0000002D

+  gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E

 

   # System Memory (DRAM): These PCDs define the region of in-built system memory

   # Some platforms can get DRAM extensions, these additional regions will be declared

diff --git a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
index ae7fa1c..5faac33 100755
--- a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
+++ b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
@@ -293,7 +293,7 @@ InitializeDebugAgent (
     //

     // Get the PrePi or PrePeiCore module (defined as SEC type module)

     //

-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdNormalFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);

+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);

     if (!EFI_ERROR(Status)) {

       Status = GetImageContext (FfsHeader,&ImageContext);

       if (!EFI_ERROR(Status)) {

@@ -304,7 +304,7 @@ InitializeDebugAgent (
     //

     // Get the PeiCore module (defined as PEI_CORE type module)

     //

-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdNormalFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);

+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);

     if (!EFI_ERROR(Status)) {

       Status = GetImageContext (FfsHeader,&ImageContext);

       if (!EFI_ERROR(Status)) {

diff --git a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
index 4d62159..e2c7240 100755
--- a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
+++ b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
@@ -35,4 +35,4 @@
 

 [Pcd]

   gArmTokenSpaceGuid.PcdSecureFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvBaseAddress

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 2124d06..f805900 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -27,8 +27,8 @@
 
 
 [FD.ArmRealViewEb_EFI]
-BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize
+BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize
 ErasePolarity = 1
 BlockSize     = 0x00010000
 NumBlocks     = 0x20
@@ -54,7 +54,7 @@ gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize
 FV = FVMAIN_SEC
 
 0x00050000|0x00100000
-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvSize
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
 ################################################################################
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index 12a6847..70247d0 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -27,8 +27,8 @@
 

 

 [FD.ArmRealViewEb_EFI]

-BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize

+BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress

+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize

 ErasePolarity = 1

 BlockSize     = 0x00010000

 NumBlocks     = 0x20

@@ -54,7 +54,7 @@ gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize
 FV = FVMAIN_SEC

 

 0x00050000|0x00100000

-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvSize

+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

 FV = FVMAIN_COMPACT

 

 ################################################################################

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
index ee4a404..6c43240 100755
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
@@ -65,5 +65,5 @@ ArmPlatformSecExtraAction (
   OUT UINTN*        JumpAddress
   )
 {
-  *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);
+  *JumpAddress = PcdGet32(PcdFvBaseAddress);
 }
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index d59fbfd..f72b50d 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -40,4 +40,4 @@
   gEmbeddedTokenSpaceGuid.PcdCacheEnable

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvBaseAddress

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 7b27bfc..3b6b584 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -55,11 +55,11 @@ FV = FVMAIN_SEC
 
 [FD.ArmVExpress_EFI]
 !if $(EDK2_ARMVE_STANDALONE) == 1
-BaseAddress   = 0x45000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress  # The base address of the Firmware in NOR Flash.
+BaseAddress   = 0x45000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
 !else
-BaseAddress   = 0x80000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress  # The base address of the Firmware in remapped DRAM.
+BaseAddress   = 0x80000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in remapped DRAM.
 !endif
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize         # The size in bytes of the FLASH Device
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
 ErasePolarity = 1
 
 # This one is tricky, it must be: BlockSize * NumBlocks = Size
@@ -83,7 +83,7 @@ NumBlocks     = 0x200
 ################################################################################
 
 0x00000000|0x00200000
-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvBaseSize
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvBaseSize
 FV = FVMAIN_COMPACT
 
 
diff --git a/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt b/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
index 418706f..91f586e 100644
--- a/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
+++ b/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
@@ -15,8 +15,8 @@ PCDs	Description :
 # Firmware Device / Volume

 gArmTokenSpaceGuid.PcdSecureFdBaseAddress       : Base address of your Secure Firmware Device 

 gArmTokenSpaceGuid.PcdSecureFdSize              : Size in byte of your Secure Firmware Device.

-gArmTokenSpaceGuid.PcdNormalFdBaseAddress       : Base Address of your Non-Secure/Normal World Firmware Device.

-gArmTokenSpaceGuid.PcdNormalFdSize              : Size in bytes of your Non-Secure/Normal World Firmware Device 

+gArmTokenSpaceGuid.PcdFdBaseAddress       : Base Address of your Non-Secure/Normal World Firmware Device.

+gArmTokenSpaceGuid.PcdFdSize              : Size in bytes of your Non-Secure/Normal World Firmware Device 

 

 # Stacks

 gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase             : Base of Secure Stack for Secure World

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 5739079..1c44566 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -33,7 +33,7 @@ NonSecureWaitForFirmware (
   VOID (*secondary_start)(VOID);

 

   // The secondary cores will execute the firmware once wake from WFI.

-  secondary_start = (VOID (*)())PcdGet32(PcdNormalFvBaseAddress);

+  secondary_start = (VOID (*)())PcdGet32(PcdFvBaseAddress);

 

   ArmCallWFI();

 

@@ -65,7 +65,7 @@ ArmPlatformSecExtraAction (
 

   if (FeaturePcdGet (PcdStandalone) == FALSE) {

     if (IS_PRIMARY_CORE(MpId)) {

-      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdNormalFvBaseAddress);

+      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdFvBaseAddress);

 

       // Patch the DRAM to make an infinite loop at the start address

       *StartAddress = 0xEAFFFFFE; // opcode for while(1)

@@ -73,7 +73,7 @@ ArmPlatformSecExtraAction (
       CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"Waiting for firmware at 0x%08X ...\n\r",StartAddress);

       SerialPortWrite ((UINT8 *) Buffer, CharCount);

 

-      *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);

+      *JumpAddress = PcdGet32(PcdFvBaseAddress);

     } else {

       // When the primary core is stopped by the hardware debugger to copy the firmware

       // into DRAM. The secondary cores are still running. As soon as the first bytes of

@@ -90,7 +90,7 @@ ArmPlatformSecExtraAction (
       ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

 

       // To enter into Non Secure state, we need to make a return from exception

-      *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);

+      *JumpAddress = PcdGet32(PcdFvBaseAddress);

     } else {

       // We wait for the primary core to finish to initialize the System Memory. Otherwise the secondary

       // cores would make crash the system by setting their stacks in DRAM before the primary core has not

@@ -98,6 +98,6 @@ ArmPlatformSecExtraAction (
       *JumpAddress = (UINTN)NonSecureWaitForFirmware;

     }

   } else {

-    *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);

+    *JumpAddress = PcdGet32(PcdFvBaseAddress);

   }

 }

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
index 93249cf..96b664c 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
@@ -45,7 +45,7 @@
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
+  gArmTokenSpaceGuid.PcdFvBaseAddress
   
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
   gArmTokenSpaceGuid.PcdArmPrimaryCore
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
index 8469c23..aee41c2 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
@@ -100,47 +100,47 @@ MemoryPeim (
   );

 

   SystemMemoryTop = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize);

-  FdTop = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);

+  FdTop = PcdGet32(PcdFdBaseAddress) + PcdGet32(PcdFdSize);

 

   // EDK2 does not have the concept of boot firmware copied into DRAM. To avoid the DXE

   // core to overwrite this area we must mark the region with the attribute non-present

-  if ((PcdGet32 (PcdNormalFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {

+  if ((PcdGet32 (PcdFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {

     Found = FALSE;

 

     // Search for System Memory Hob that contains the firmware

     NextHob.Raw = GetHobList ();

     while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, NextHob.Raw)) != NULL) {

       if ((NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&

-          (PcdGet32(PcdNormalFdBaseAddress) >= NextHob.ResourceDescriptor->PhysicalStart) &&

+          (PcdGet32(PcdFdBaseAddress) >= NextHob.ResourceDescriptor->PhysicalStart) &&

           (FdTop <= NextHob.ResourceDescriptor->PhysicalStart + NextHob.ResourceDescriptor->ResourceLength))

       {

         ResourceAttributes = NextHob.ResourceDescriptor->ResourceAttribute;

         ResourceLength = NextHob.ResourceDescriptor->ResourceLength;

         ResourceTop = NextHob.ResourceDescriptor->PhysicalStart + ResourceLength;

 

-        if (PcdGet32(PcdNormalFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {

+        if (PcdGet32(PcdFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {

           if (SystemMemoryTop == FdTop) {

             NextHob.ResourceDescriptor->ResourceAttribute = ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT;

           } else {

             // Create the System Memory HOB for the firmware with the non-present attribute

             BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,

                                         ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,

-                                        PcdGet32(PcdNormalFdBaseAddress),

-                                        PcdGet32(PcdNormalFdSize));

+                                        PcdGet32(PcdFdBaseAddress),

+                                        PcdGet32(PcdFdSize));

 

             // Top of the FD is system memory available for UEFI

-            NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdNormalFdSize);

-            NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdNormalFdSize);

+            NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdFdSize);

+            NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdFdSize);

           }

         } else {

           // Create the System Memory HOB for the firmware with the non-present attribute

           BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,

                                       ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,

-                                      PcdGet32(PcdNormalFdBaseAddress),

-                                      PcdGet32(PcdNormalFdSize));

+                                      PcdGet32(PcdFdBaseAddress),

+                                      PcdGet32(PcdFdSize));

 

           // Update the HOB

-          NextHob.ResourceDescriptor->ResourceLength = PcdGet32(PcdNormalFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;

+          NextHob.ResourceDescriptor->ResourceLength = PcdGet32(PcdFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;

 

           // If there is some memory available on the top of the FD then create a HOB

           if (FdTop < NextHob.ResourceDescriptor->PhysicalStart + ResourceLength) {

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
index 1462343..8c8d610 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
@@ -45,8 +45,8 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
+  gArmTokenSpaceGuid.PcdFdBaseAddress
+  gArmTokenSpaceGuid.PcdFdSize
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 3559e08..1de7d38 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -108,8 +108,8 @@ InitializeMemory (
 

   SystemMemoryBase = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase);

   SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);

-  FdBase = (UINTN)PcdGet32 (PcdNormalFdBaseAddress);

-  FdTop = FdBase + (UINTN)PcdGet32 (PcdNormalFdSize);

+  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);

+  FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);

 

   //

   // Initialize the System Memory (DRAM)

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index e017463..ee44004 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -52,8 +52,8 @@
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFdSize

+  gArmTokenSpaceGuid.PcdFdBaseAddress

+  gArmTokenSpaceGuid.PcdFdSize

 

   gArmTokenSpaceGuid.PcdSystemMemoryBase

   gArmTokenSpaceGuid.PcdSystemMemorySize

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
index d4faa62..9f5331a 100755
--- a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
@@ -29,7 +29,7 @@ PlatformPeim (
 

   BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));

 

-  BuildFvHob (PcdGet32(PcdNormalFvBaseAddress), PcdGet32(PcdNormalFvSize));

+  BuildFvHob (PcdGet32(PcdFvBaseAddress), PcdGet32(PcdFvSize));

 

   return EFI_SUCCESS;

 }

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
index 74fdcc8..3ea29f4 100755
--- a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
@@ -40,11 +40,11 @@
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
+  gArmTokenSpaceGuid.PcdFdBaseAddress
+  gArmTokenSpaceGuid.PcdFdSize
   
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFvSize
+  gArmTokenSpaceGuid.PcdFvBaseAddress
+  gArmTokenSpaceGuid.PcdFvSize
   
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
index 2a7c093..201c98c 100755
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
@@ -49,11 +49,11 @@
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFdSize

+  gArmTokenSpaceGuid.PcdFdBaseAddress

+  gArmTokenSpaceGuid.PcdFdSize

   

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvSize

+  gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvSize

   

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index 732e751..5402161 100644
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
@@ -80,8 +80,8 @@ PrimaryMain (
   // Note also:  HOBs (pei temp ram) MUST be above stack

   //

   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFvBaseAddress);

-  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFvSize);

+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);

+  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);

   SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize); // We consider we run on the primary core (and so we use the first stack)

   SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize);

   SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index 64877d1..9db6fdf 100644
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
@@ -42,8 +42,8 @@ PrimaryMain (
   // Note also:  HOBs (pei temp ram) MUST be above stack

   //

   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFvBaseAddress);

-  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFvSize);

+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);

+  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);

   SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize); // We consider we run on the primary core (and so we use the first stack)

   SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize);

   SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index f9b85a6..0ec4e0c 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
@@ -76,7 +76,7 @@ _InitGlobals:
 

 _PrepareArguments:

   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFvBaseAddress), r2)

+  LoadConstantToReg (FixedPcdGet32(PcdFvBaseAddress), r2)

   add   r2, r2, #4

   ldr   r1, [r2]

 

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
index 1964f18..1694b90 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
@@ -78,7 +78,7 @@ _InitGlobals
 

 _PrepareArguments

   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFvBaseAddress), r2)

+  LoadConstantToReg (FixedPcdGet32(PcdFvBaseAddress), r2)

   add   r2, r2, #4

   ldr   r1, [r2]

 

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 1458935..cd3c346 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -55,8 +55,8 @@
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvSize

+  gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvSize

 

   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask

   gArmTokenSpaceGuid.PcdArmPrimaryCore

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 028330d..5731874 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -53,8 +53,8 @@
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvSize

+  gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvSize

 

   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask

   gArmTokenSpaceGuid.PcdArmPrimaryCore

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index b5f2ee2..601128b 100755
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -48,9 +48,9 @@ _SetupStackPosition:
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize

 

   // Calculate Top of the Firmware Device

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)

-  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize

+  LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)

+  LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)

+  add   r3, r3, r2      // r4 = FdTop = PcdFdBaseAddress + PcdFdSize

 

   // UEFI Memory Size (stacks are allocated in this region)

   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
index 965bb00..2c798d0 100644
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
@@ -49,9 +49,9 @@ _SetupStackPosition
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize

 

   // Calculate Top of the Firmware Device

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)

-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)

-  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize

+  LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)

+  LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)

+  add   r3, r3, r2      // r4 = FdTop = PcdFdBaseAddress + PcdFdSize

 

   // UEFI Memory Size (stacks are allocated in this region)

   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index f141dc0..3b2d723 100755
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -64,11 +64,11 @@
 [FixedPcd]

   gArmTokenSpaceGuid.PcdVFPEnabled

 

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFdSize

+  gArmTokenSpaceGuid.PcdFdBaseAddress

+  gArmTokenSpaceGuid.PcdFdSize

 

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvSize

+  gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvSize

 

   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index ccf421c..6c13738 100755
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -62,11 +62,11 @@
 [FixedPcd]

   gArmTokenSpaceGuid.PcdVFPEnabled

 

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFdSize

+  gArmTokenSpaceGuid.PcdFdBaseAddress

+  gArmTokenSpaceGuid.PcdFdSize

 

-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFvSize

+  gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdFvSize

 

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize

   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize

diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c
index 6f4738f..07fe5ca 100644
--- a/ArmPlatformPkg/Sec/Sec.c
+++ b/ArmPlatformPkg/Sec/Sec.c
@@ -207,7 +207,7 @@ CEntryPoint (
     copy_cpsr_into_spsr ();
   }
 
-  JumpAddress = PcdGet32 (PcdNormalFvBaseAddress);
+  JumpAddress = PcdGet32 (PcdFvBaseAddress);
   ArmPlatformSecExtraAction (MpId, &JumpAddress);
 
   return_from_exception (JumpAddress);
diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index d2c5083..281306f 100644
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -56,7 +56,7 @@
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
   gArmTokenSpaceGuid.PcdArmPrimaryCore
   
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
+  gArmTokenSpaceGuid.PcdFvBaseAddress
   
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize
diff --git a/BeagleBoardPkg/BeagleBoardPkg-next.fdf b/BeagleBoardPkg/BeagleBoardPkg-next.fdf
index d9ad778..be493d8 100755
--- a/BeagleBoardPkg/BeagleBoardPkg-next.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg-next.fdf
@@ -27,8 +27,8 @@
 
 
 [FD.BeagleBoard_EFI]
-BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress  #The base address of the FLASH Device.
-Size          = 0x00080000|gArmTokenSpaceGuid.PcdNormalFdSize         #The size in bytes of the FLASH Device
+BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
+Size          = 0x00080000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x1
 NumBlocks     = 0x80000
@@ -56,7 +56,7 @@ NumBlocks     = 0x80000
 
 0x00000208|0x0007FDF8
 !endif
-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvBaseSize
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvBaseSize
 FV = FVMAIN_COMPACT
 
 ################################################################################
diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
index d9188ad..3cd8551 100755
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
@@ -48,8 +48,8 @@
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
+  gArmTokenSpaceGuid.PcdFdBaseAddress
+  gArmTokenSpaceGuid.PcdFdSize
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize