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

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 65a97574c045fd0b4dfb570a5cc8639dd968a50e..ea79b08822be463bb89ac94517253ac6f4268492 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -86,10 +86,10 @@
   #\r
   # ARM Normal (or Non Secure) Firmware PCDs\r
   #\r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0|UINT32|0x0000002B\r
-  gArmTokenSpaceGuid.PcdNormalFdSize|0|UINT32|0x0000002C\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress|0|UINT32|0x0000002D\r
-  gArmTokenSpaceGuid.PcdNormalFvSize|0|UINT32|0x0000002E\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT32|0x0000002B\r
+  gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT32|0x0000002D\r
+  gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E\r
 \r
   # System Memory (DRAM): These PCDs define the region of in-built system memory\r
   # Some platforms can get DRAM extensions, these additional regions will be declared\r

diff --git a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
index ae7fa1ca3528f8e6b0f6206e7008b7fd27d01206..5faac3339c24625f0440de33f6e1b3149ff06ae1 100755 (executable)
--- a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
+++ b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.c
@@ -293,7 +293,7 @@ InitializeDebugAgent (
     //\r
     // Get the PrePi or PrePeiCore module (defined as SEC type module)\r
     //\r
-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdNormalFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
     if (!EFI_ERROR(Status)) {\r
       Status = GetImageContext (FfsHeader,&ImageContext);\r
       if (!EFI_ERROR(Status)) {\r
@@ -304,7 +304,7 @@ InitializeDebugAgent (
     //\r
     // Get the PeiCore module (defined as PEI_CORE type module)\r
     //\r
-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdNormalFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);\r
+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);\r
     if (!EFI_ERROR(Status)) {\r
       Status = GetImageContext (FfsHeader,&ImageContext);\r
       if (!EFI_ERROR(Status)) {\r

diff --git a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
index 4d6215947082a06e37ae615bc1cfa01e23b588fd..e2c724082764f31df3e0e609873b441112ea626a 100755 (executable)
--- a/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
+++ b/ArmPkg/Library/DebugAgentSymbolsOnlyLib/DebugAgentSymbolsOnlyLib.inf
@@ -35,4 +35,4 @@
 \r
 [Pcd]\r
   gArmTokenSpaceGuid.PcdSecureFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 2124d06509fadcd657ab1d24101af0757278e0c7..f805900f4297e207c66edf9e8b2636f4394af83c 100644 (file)
--- 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 12a6847aa25ca7f8723fc8009319aababb99f721..70247d0d58cbd833d418a2642508980a3aea3ccd 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -27,8 +27,8 @@
 \r
 \r
 [FD.ArmRealViewEb_EFI]\r
-BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize\r
+BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
 NumBlocks     = 0x20\r
@@ -54,7 +54,7 @@ gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize
 FV = FVMAIN_SEC\r
 \r
 0x00050000|0x00100000\r
-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvSize\r
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
 ################################################################################\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
index ee4a404da38147e3a94d2abb93732cfd74ca35b1..6c43240406bb62fc4222ddaab3df680d5c623a5e 100755 (executable)
--- 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 d59fbfdfe8756f65e3603666ad871bfc8f6dcec7..f72b50dde48a38409b4c86410d22bcc3a1022a67 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -40,4 +40,4 @@
   gEmbeddedTokenSpaceGuid.PcdCacheEnable\r
 \r
 [FixedPcd]\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 7b27bfc7f991e2dae3e35cf0cce7e1e938a20f31..3b6b584ff5dcc6aefaf9394529ded44a37a3ae86 100644 (file)
--- 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 418706fdefa07743ac8b59366507eb012f1c984e..91f586ef761da1090f7b7599e0e62bac480ffc27 100644 (file)
--- a/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
+++ b/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
@@ -15,8 +15,8 @@ PCDs  Description :
 # Firmware Device / Volume\r
 gArmTokenSpaceGuid.PcdSecureFdBaseAddress       : Base address of your Secure Firmware Device \r
 gArmTokenSpaceGuid.PcdSecureFdSize              : Size in byte of your Secure Firmware Device.\r
-gArmTokenSpaceGuid.PcdNormalFdBaseAddress       : Base Address of your Non-Secure/Normal World Firmware Device.\r
-gArmTokenSpaceGuid.PcdNormalFdSize              : Size in bytes of your Non-Secure/Normal World Firmware Device \r
+gArmTokenSpaceGuid.PcdFdBaseAddress       : Base Address of your Non-Secure/Normal World Firmware Device.\r
+gArmTokenSpaceGuid.PcdFdSize              : Size in bytes of your Non-Secure/Normal World Firmware Device \r
 \r
 # Stacks\r
 gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase             : Base of Secure Stack for Secure World\r

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

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
index 93249cfe341741f39733ed4a67d405d1f7b9ded2..96b664ceef2d06659de2a12f6f5ad78f7e75a697 100755 (executable)
--- 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 8469c235eb84542ba51b87cd4f7c80082bf7f2d8..aee41c247b35b2b45ed28abe14afcda6c82d5322 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
@@ -100,47 +100,47 @@ MemoryPeim (
   );\r
 \r
   SystemMemoryTop = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize);\r
-  FdTop = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
+  FdTop = PcdGet32(PcdFdBaseAddress) + PcdGet32(PcdFdSize);\r
 \r
   // EDK2 does not have the concept of boot firmware copied into DRAM. To avoid the DXE\r
   // core to overwrite this area we must mark the region with the attribute non-present\r
-  if ((PcdGet32 (PcdNormalFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {\r
+  if ((PcdGet32 (PcdFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {\r
     Found = FALSE;\r
 \r
     // Search for System Memory Hob that contains the firmware\r
     NextHob.Raw = GetHobList ();\r
     while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, NextHob.Raw)) != NULL) {\r
       if ((NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&\r
-          (PcdGet32(PcdNormalFdBaseAddress) >= NextHob.ResourceDescriptor->PhysicalStart) &&\r
+          (PcdGet32(PcdFdBaseAddress) >= NextHob.ResourceDescriptor->PhysicalStart) &&\r
           (FdTop <= NextHob.ResourceDescriptor->PhysicalStart + NextHob.ResourceDescriptor->ResourceLength))\r
       {\r
         ResourceAttributes = NextHob.ResourceDescriptor->ResourceAttribute;\r
         ResourceLength = NextHob.ResourceDescriptor->ResourceLength;\r
         ResourceTop = NextHob.ResourceDescriptor->PhysicalStart + ResourceLength;\r
 \r
-        if (PcdGet32(PcdNormalFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {\r
+        if (PcdGet32(PcdFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {\r
           if (SystemMemoryTop == FdTop) {\r
             NextHob.ResourceDescriptor->ResourceAttribute = ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT;\r
           } else {\r
             // Create the System Memory HOB for the firmware with the non-present attribute\r
             BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,\r
                                         ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,\r
-                                        PcdGet32(PcdNormalFdBaseAddress),\r
-                                        PcdGet32(PcdNormalFdSize));\r
+                                        PcdGet32(PcdFdBaseAddress),\r
+                                        PcdGet32(PcdFdSize));\r
 \r
             // Top of the FD is system memory available for UEFI\r
-            NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdNormalFdSize);\r
-            NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdNormalFdSize);\r
+            NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdFdSize);\r
+            NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdFdSize);\r
           }\r
         } else {\r
           // Create the System Memory HOB for the firmware with the non-present attribute\r
           BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,\r
                                       ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,\r
-                                      PcdGet32(PcdNormalFdBaseAddress),\r
-                                      PcdGet32(PcdNormalFdSize));\r
+                                      PcdGet32(PcdFdBaseAddress),\r
+                                      PcdGet32(PcdFdSize));\r
 \r
           // Update the HOB\r
-          NextHob.ResourceDescriptor->ResourceLength = PcdGet32(PcdNormalFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;\r
+          NextHob.ResourceDescriptor->ResourceLength = PcdGet32(PcdFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;\r
 \r
           // If there is some memory available on the top of the FD then create a HOB\r
           if (FdTop < NextHob.ResourceDescriptor->PhysicalStart + ResourceLength) {\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
index 14623438fe6870f4116b4c06da5d6276b6d6c5e6..8c8d6108831fcda2628bcbfcccaa080bd44843a7 100755 (executable)
--- 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 3559e08862b3ee7ec64c5ee1a706d69d5687c3a3..1de7d38078c506a5684d3f9bf19739a450782c41 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -108,8 +108,8 @@ InitializeMemory (
 \r
   SystemMemoryBase = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase);\r
   SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);\r
-  FdBase = (UINTN)PcdGet32 (PcdNormalFdBaseAddress);\r
-  FdTop = FdBase + (UINTN)PcdGet32 (PcdNormalFdSize);\r
+  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);\r
+  FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);\r
 \r
   //\r
   // Initialize the System Memory (DRAM)\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index e0174635546bb9dd2ba7e64d0f9097f234a0bede..ee44004d84694fe934ff25fcee38a277e7c61936 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -52,8 +52,8 @@
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec\r
 \r
 [FixedPcd]\r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFdSize\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdFdSize\r
 \r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
   gArmTokenSpaceGuid.PcdSystemMemorySize\r

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
index d4faa6258e897f53c817b16082e21f3e5314f99d..9f5331a405a84af3708878cc1e1e683d01c3fc7f 100755 (executable)
--- a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.c
@@ -29,7 +29,7 @@ PlatformPeim (
 \r
   BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));\r
 \r
-  BuildFvHob (PcdGet32(PcdNormalFvBaseAddress), PcdGet32(PcdNormalFvSize));\r
+  BuildFvHob (PcdGet32(PcdFvBaseAddress), PcdGet32(PcdFvSize));\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
index 74fdcc8c421c6d53192b27d9ee654049feb6be4e..3ea29f47ebcc8705c5b52e58561a9f3cc518c445 100755 (executable)
--- 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 2a7c09389a0e3d731657f5fd3936b6e0b0d3b9b6..201c98cd5d1c7e8e11bdb532d40988a60e7a8fca 100755 (executable)
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf
@@ -49,11 +49,11 @@
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED\r
 \r
 [FixedPcd]\r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFdSize\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdFdSize\r
   \r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvSize\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvSize\r
   \r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize\r

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index 732e751c955051d3a5778f247af8da199c23c175..5402161b62b3fc9cd73a6f50c6fc016bdbf15aa3 100644 (file)
--- 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\r
   //\r
   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFvBaseAddress);\r
-  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFvSize);\r
+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);\r
+  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);\r
   SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize); // We consider we run on the primary core (and so we use the first stack)\r
   SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize);\r
   SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));\r

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index 64877d1cc1800a1ec6a66970633f1af593287a09..9db6fdfbd5f38e85748d4637ecbeb1a3a2943c09 100644 (file)
--- 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\r
   //\r
   SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
-  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFvBaseAddress);\r
-  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFvSize);\r
+  SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdFvBaseAddress);\r
+  SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdFvSize);\r
   SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize); // We consider we run on the primary core (and so we use the first stack)\r
   SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize);\r
   SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index f9b85a604ef95cc2c28f455f623d4bb07698839b..0ec4e0c6e1bfd93c251c3e50f8d1499fc714aee6 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
@@ -76,7 +76,7 @@ _InitGlobals:
 \r
 _PrepareArguments:\r
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFvBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdFvBaseAddress), r2)\r
   add   r2, r2, #4\r
   ldr   r1, [r2]\r
 \r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
index 1964f18ebfb3874ea5c1c121483a4fa2b24a6c7b..1694b905d0873568462ee4e7b9611724840fc4f1 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
@@ -78,7 +78,7 @@ _InitGlobals
 \r
 _PrepareArguments\r
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFvBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdFvBaseAddress), r2)\r
   add   r2, r2, #4\r
   ldr   r1, [r2]\r
 \r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 145893505d688742a926334909520ec45ad85f8a..cd3c3461f8c2e98b13e17b9a544b8819899234f3 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -55,8 +55,8 @@
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores\r
 \r
 [FixedPcd]\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvSize\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvSize\r
 \r
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask\r
   gArmTokenSpaceGuid.PcdArmPrimaryCore\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 028330d03bd6664e38d78d5dc2654a0c00835921..57318744b4e6a785304c9ad6d58133ab3b279ca5 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -53,8 +53,8 @@
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores\r
 \r
 [FixedPcd]\r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvSize\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvSize\r
 \r
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask\r
   gArmTokenSpaceGuid.PcdArmPrimaryCore\r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index b5f2ee2e57a583ae4fdd8d9d1d6af6ef79bb7bcc..601128b12f2eedcbef0b27551b65a7376bb537b0 100755 (executable)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -48,9 +48,9 @@ _SetupStackPosition:
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r
 \r
   // Calculate Top of the Firmware Device\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)\r
-  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize\r
+  LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)\r
+  add   r3, r3, r2      // r4 = FdTop = PcdFdBaseAddress + PcdFdSize\r
 \r
   // UEFI Memory Size (stacks are allocated in this region)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
index 965bb003188bf7b1d7449187a3509f61f1b97502..2c798d09d7b853062cb2ed057628e015365575ca 100644 (file)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
@@ -49,9 +49,9 @@ _SetupStackPosition
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r
 \r
   // Calculate Top of the Firmware Device\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)\r
-  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize\r
+  LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)\r
+  add   r3, r3, r2      // r4 = FdTop = PcdFdBaseAddress + PcdFdSize\r
 \r
   // UEFI Memory Size (stacks are allocated in this region)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index f141dc03beaf69af047530de8fafbe2362eec5ea..3b2d723c39ce4cbc58b1e53fc6788deccd0e1d64 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -64,11 +64,11 @@
 [FixedPcd]\r
   gArmTokenSpaceGuid.PcdVFPEnabled\r
 \r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFdSize\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdFdSize\r
 \r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvSize\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvSize\r
 \r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase\r
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize\r

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index ccf421ca692bd15143d78dac5076e4719d9fdc36..6c137382931bad456fdf29e3dde68757df17704f 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -62,11 +62,11 @@
 [FixedPcd]\r
   gArmTokenSpaceGuid.PcdVFPEnabled\r
 \r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFdSize\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdFdSize\r
 \r
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFvSize\r
+  gArmTokenSpaceGuid.PcdFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdFvSize\r
 \r
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize\r

diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c
index 6f4738fd4dae57ca2ab0e9bbba023c4ec68fd3d1..07fe5ca43c3223ec88ba17c481b9a2a2b5964980 100644 (file)
--- 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 d2c5083c21068cdfe17b514dbf691c96bf604912..281306f890d137d015de1bb7cb525aebce0b42e9 100644 (file)
--- 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 d9ad778cb3f4ce261f54eefcae9a8c086e9aebee..be493d82f9bf84f431eff97f48db7159e210da01 100755 (executable)
--- 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 d9188ad1601d6446b5202de0585489e1881d43b8..3cd8551501fc69b0f7e3318a0c7cfd22f19b676e 100755 (executable)
--- 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