ArmPlatformPkg: Rename gEmbeddedTokenSpaceGuid.PcdEmbeddedFd* into gArmTokenSpaceGuid.PcdNormalFd*

    
This renaming is for matching the namespace with the secure firmware
gArmTokenSpaceGuid.PcdSecureFdBaseAddress/Size.



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

6 files changed, 12 insertions, 17 deletions

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index ea69b8ec2..2a4ee6195 100644
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
@@ -77,8 +77,8 @@ VOID primary_main (
 	// Note also:  HOBs (pei temp ram) MUST be above stack

 	//

 	SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

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

-	SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdEmbeddedFdSize);

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

+    SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFdSize);

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

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

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

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index cf7d029bf..ac7b16a5c 100644
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
@@ -39,8 +39,8 @@ VOID primary_main (
 	// Note also:  HOBs (pei temp ram) MUST be above stack

 	//

 	SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

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

-	SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdEmbeddedFdSize);

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

+    SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFdSize);

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

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

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

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index cf9cb9f9c..53c16ccb6 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
@@ -48,7 +48,7 @@ _SetupStack:
   # lr points to area in reset vector block containing PEI core address. lr needs to
   # be saved from the beginning as the _ModuleEntryPoint could call helper functions
   # that will overwrite 'lr'
-  LoadConstantToReg (FixedPcdGet32(PcdEmbeddedFdBaseAddress), r2)
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)
   add   r2, r2, #4
   ldr   r1, [r2]
 
@@ -56,10 +56,9 @@ _SetupStack:
   # ensure we're jumping to FV version of the code (not boot remapped alias)
   ldr   r2, StartupAddr
 
-  # jump to SEC C code
+  # jump to PrePeiCore C code
   #    r0 = core_id
   #    r1 = pei_core_address
   blx   r2
 
-#end of the file
 .end
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
index 44263391a..de5fac15f 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
@@ -26,8 +26,6 @@
   

 StartupAddr        DCD      CEntryPoint

 

-SCC_SYS_SW         EQU      0x0004

-

 _ModuleEntryPoint

   // Identify CPU ID

   mrc   p15, 0, r0, c0, c0, 5

@@ -45,7 +43,7 @@ _SetupStack
   mov     sp, r3

 

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

-  LoadConstantToReg (FixedPcdGet32(PcdEmbeddedFdBaseAddress), r2)

+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)

   add   r2, r2, #4

   ldr   r1, [r2]

 

@@ -53,7 +51,7 @@ _SetupStack
   // ensure we're jumping to FV version of the code (not boot remapped alias)

   ldr   r2, StartupAddr

 

-  // jump to SEC C code

+  // jump to PrePeiCore C code

   //    r0 = core_id

   //    r1 = pei_core_address

   blx   r2

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index ed85234b3..385b40736 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -33,7 +33,6 @@
 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

 

@@ -54,8 +53,8 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone

   

 [FixedPcd]

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize

+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

+  gArmTokenSpaceGuid.PcdNormalFdSize

 

   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase

   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index a7bf3bd98..58b8e339e 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -33,7 +33,6 @@
 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

 

@@ -52,8 +51,8 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone

   

 [FixedPcd]

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress

-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize

+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

+  gArmTokenSpaceGuid.PcdNormalFdSize

 

   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase

   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize