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

4 files changed, 17 insertions, 17 deletions

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
index 8469c235eb..aee41c247b 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 14623438fe..8c8d610883 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 3559e08862..1de7d38078 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 e017463554..ee44004d84 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