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

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

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 63445756d916d19ded4417c890ea8e8cde2f3286..4d5db9f89fb42aeda12c93ea7b03f7a9b57a93d6 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -83,11 +83,17 @@
   gArmTokenSpaceGuid.PcdGicNumInterrupts|96|UINT32|0x00000023\r
 \r
   #\r
-  # ARM Secure SEC PCDs\r
+  # ARM Secure Firmware PCDs\r
   #\r
   gArmTokenSpaceGuid.PcdSecureFdBaseAddress|0|UINT32|0x00000015\r
   gArmTokenSpaceGuid.PcdSecureFdSize|0|UINT32|0x00000016\r
 \r
+  #\r
+  # ARM Normal (or Non Secure) Firmware PCDs\r
+  #\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0|UINT32|0x0000002B\r
+  gArmTokenSpaceGuid.PcdNormalFdSize|0|UINT32|0x0000002C\r
+\r
   #\r
   # ARM MPCore MailBox PCDs\r
   #\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 4243c8edf9d46ece62f9874a89f84ec6e016edaa..2f2c5c8c8fd76620a57bd23d3441a31985418a2a 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -323,8 +323,8 @@
   gArmPlatformTokenSpaceGuid.PcdPeiServicePtrAddr|0x48020004        # Pei Services Ptr just above stack\r
 \r
   # Non Sec UEFI Firmware: These two PCDs must match PcdFlashFvMainBase/PcdFlashFvMainSize\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress|0x40050000       # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize|0x00100000              # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0x40050000       # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase\r
+  gArmTokenSpaceGuid.PcdNormalFdSize|0x00100000              # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize\r
   \r
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms\r
   \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 2c70248153981be2594c012a5d80c1ac7af281df..912fad00ca3d8b10160fd05c82928e0b4030258d 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -327,8 +327,8 @@
   gArmPlatformTokenSpaceGuid.PcdPeiServicePtrAddr|0x48020004        # Pei Services Ptr just above stack
 
   # Non Sec UEFI Firmware: These two PCDs must match PcdFlashFvMainBase/PcdFlashFvMainSize
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress|0x40050000       # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize|0x00100000              # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress|0x40050000       # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase
+  gArmTokenSpaceGuid.PcdNormalFdSize|0x00100000              # Must be equal to gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize
   
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms
   

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
index 37a21d8715e6f974039ffd0aceb4ece69eccc9c8..97b206d780fb7c81933fd99f7ba75a7699908190 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
@@ -42,5 +42,5 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
+  gArmTokenSpaceGuid.PcdNormalFdSize

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index f633f59462983e15e52d73812e96a325f92bd653..01720bb23eacf6a6f49c5a8b029aab9bf3e1eb85 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -179,14 +179,14 @@ VOID ArmPlatformGetEfiMemoryMap (
         // Chunk between the EFI Memory region and the firmware\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes;\r
         EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdBaseAddress) - MemoryBase;\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdBaseAddress) - MemoryBase;\r
 \r
         // Chunk reserved by the firmware in DRAM\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes & (~EFI_RESOURCE_ATTRIBUTE_PRESENT);\r
-        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdEmbeddedFdBaseAddress);\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdSize);\r
+        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdNormalFdBaseAddress);\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdSize);\r
 \r
-        MemoryBase = PcdGet32(PcdEmbeddedFdBaseAddress) + PcdGet32(PcdEmbeddedFdSize);\r
+        MemoryBase = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
     }\r
       \r
     // We allocate all the remain memory as untested system memory\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index dbfc37b725b67cee741d65931197c24329c61130..e5bb73d9e3e03192ac536397e561148031949064 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -42,5 +42,5 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone\r
 \r
 [FixedPcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFdSize\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index e591d1e300d03581f6d9822d9fae9c0b27dfb47e..7d26d16021f3c93b4de5e2300153a30f05e577a5 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|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  # The base address of the Firmware in NOR Flash.
+BaseAddress   = 0x45000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress  # The base address of the Firmware in NOR Flash.
 !else
-BaseAddress   = 0x80000000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  # The base address of the Firmware in remapped DRAM.
+BaseAddress   = 0x80000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress  # The base address of the Firmware in remapped DRAM.
 !endif
-Size          = 0x00200000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize         # The size in bytes of the FLASH Device
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize         # The size in bytes of the FLASH Device
 ErasePolarity = 1
 
 # This one is tricky, it must be: BlockSize * NumBlocks = Size

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
index 7f68992fdc694b2d4479e5e44a9f4c919dcf5118..15e20b67830c70d146910bd6d6fba4df413fbf0d 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
@@ -45,5 +45,5 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
+  gArmTokenSpaceGuid.PcdNormalFdSize

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
index 5a05479736089b6421cd0142bc09a9c46a8cecfc..aef37b2f7e9013551e795ead26046aef033c82ae 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
@@ -46,5 +46,5 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone\r
 \r
 [FixedPcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFdSize\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
index 27eb362baf7230c941e420c0146b6d6e5fb84eaf..8d1bf1f83706a25c77a5deac80fb7520984aaba5 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
@@ -189,14 +189,14 @@ VOID ArmPlatformGetEfiMemoryMap (
         // Chunk between the EFI Memory region and the firmware\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes;\r
         EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdBaseAddress) - MemoryBase;\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdBaseAddress) - MemoryBase;\r
 \r
         // Chunk reserved by the firmware in DRAM\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes & (~EFI_RESOURCE_ATTRIBUTE_PRESENT);\r
-        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdEmbeddedFdBaseAddress);\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdSize);\r
+        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdNormalFdBaseAddress);\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdSize);\r
 \r
-        MemoryBase = PcdGet32(PcdEmbeddedFdBaseAddress) + PcdGet32(PcdEmbeddedFdSize);\r
+        MemoryBase = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
     }\r
       \r
     // We allocate all the remain memory as untested system memory\r

diff --git a/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt b/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
index 49152722d4047ed42b299cc01bcd9514d4b29ff7..87d590249f70160b73be64647e499321954084f3 100644 (file)
--- a/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
+++ b/ArmPlatformPkg/Documentation/ArmPlatformPkg.txt
@@ -9,8 +9,8 @@ Porting UEFI to a ARM platform
 PCD    Description\r
 gArmTokenSpaceGuid.PcdSecureFdBaseAddress : Base address of your Secure Firmware \r
 gArmTokenSpaceGuid.PcdSecureFdSize        : Size in byte of your Secure Firmware gEmbeddedTokenSpaceGuid.\r
-PcdEmbeddedFdBaseAddress                  : Base Address of your Non-Secure Firmware gEmbeddedTokenSpaceGuid.\r
-PcdEmbeddedFdSize                         : Size in bytes of your Non-Secure Firmware \r
+gArmTokenSpaceGuid.PcdNormalFdBaseAddress : Base Address of your Non-Secure Firmware gEmbeddedTokenSpaceGuid.\r
+gArmTokenSpaceGuid.PcdNormalFdSize        : Size in bytes of your Non-Secure Firmware \r
 gArmTokenSpaceGuid.PcdL2x0ControllerBase  : Base Address of your L2x0 controller \r
 gArmTokenSpaceGuid.PcdGicDistributorBase  : Base address of the Distributor of your General Interrupt Controller gArmTokenSpaceGuid.\r
 PcdGicInterruptInterfaceBase              : Base address of the Interface of your General Interrupt Controller gArmVExpressTokenSpaceGuid.\r

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPei.inf b/ArmPlatformPkg/PlatformPei/PlatformPei.inf
index 77c4fe64c41126ab7701ef134dc458c9cced339f..452c0258d68fd19a691afbf5fd9cfacaf270b267 100644 (file)
--- a/ArmPlatformPkg/PlatformPei/PlatformPei.inf
+++ b/ArmPlatformPkg/PlatformPei/PlatformPei.inf
@@ -33,6 +33,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   EmbeddedPkg/EmbeddedPkg.dec\r
+  ArmPkg/ArmPkg.dec\r
 \r
 [LibraryClasses]\r
   PeimEntryPoint\r
@@ -44,8 +45,8 @@
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED\r
 \r
 [FixedPcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  #The base address of the FLASH Device.\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize         #The size in bytes of the FLASH Device\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress  # The base address of the FLASH Device.\r
+  gArmTokenSpaceGuid.PcdNormalFdSize         # The size in bytes of the FLASH Device\r
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase\r
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize\r

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index ea69b8ec2d55124814c9dfab99de674cb5411bb4..2a4ee61954557096555ea2265c4d45a1df4b764b 100644 (file)
--- 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\r
        //\r
        SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
-       SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdEmbeddedFdBaseAddress);\r
-       SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdEmbeddedFdSize);\r
+    SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFdBaseAddress);\r
+    SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFdSize);\r
        SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackBase); // We consider we run on the primary core (and so we use the first stack)\r
        SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackSize);\r
        SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));\r

diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
index cf7d029bf65626c31f0f8412bfd07bfae83df823..ac7b16a5c6d77addf8953cd7d10732bc3a48c150 100644 (file)
--- 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\r
        //\r
        SecCoreData.DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
-       SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdEmbeddedFdBaseAddress);\r
-       SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdEmbeddedFdSize);\r
+    SecCoreData.BootFirmwareVolumeBase = (VOID *)(UINTN)PcdGet32 (PcdNormalFdBaseAddress);\r
+    SecCoreData.BootFirmwareVolumeSize = PcdGet32 (PcdNormalFdSize);\r
        SecCoreData.TemporaryRamBase       = (VOID *)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackBase); // We consider we run on the primary core (and so we use the first stack)\r
        SecCoreData.TemporaryRamSize       = (UINTN)(UINTN)PcdGet32 (PcdCPUCoresNonSecStackSize);\r
        SecCoreData.PeiTemporaryRamBase    = (VOID *)((UINTN)(SecCoreData.TemporaryRamBase) + (SecCoreData.TemporaryRamSize / 2));\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index cf9cb9f9ca51f207597187f1923a4b5dbecf2ab7..53c16ccb6faa1c8a538fe6953b5dc43dd1002584 100644 (file)
--- 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 44263391a38ebe599ef0ef9ef4e05910f9ea009e..de5fac15f8524a9181c80e1781ba00b230023b67 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
@@ -26,8 +26,6 @@
   \r
 StartupAddr        DCD      CEntryPoint\r
 \r
-SCC_SYS_SW         EQU      0x0004\r
-\r
 _ModuleEntryPoint\r
   // Identify CPU ID\r
   mrc   p15, 0, r0, c0, c0, 5\r
@@ -45,7 +43,7 @@ _SetupStack
   mov     sp, r3\r
 \r
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector\r
-  LoadConstantToReg (FixedPcdGet32(PcdEmbeddedFdBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)\r
   add   r2, r2, #4\r
   ldr   r1, [r2]\r
 \r
@@ -53,7 +51,7 @@ _SetupStack
   // ensure we're jumping to FV version of the code (not boot remapped alias)\r
   ldr   r2, StartupAddr\r
 \r
-  // jump to SEC C code\r
+  // jump to PrePeiCore C code\r
   //    r0 = core_id\r
   //    r1 = pei_core_address\r
   blx   r2\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index ed85234b365f2bc8c4417d7ea566076f26d8c5b4..385b4073631b1b83afbf27f07c219b5059b76865 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -33,7 +33,6 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
   ArmPkg/ArmPkg.dec\r
   ArmPlatformPkg/ArmPlatformPkg.dec\r
 \r
@@ -54,8 +53,8 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone\r
   \r
 [FixedPcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFdSize\r
 \r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index a7bf3bd98685f69936079fa8db55c749936b2010..58b8e339edefdee4c650ccaaf9b53d9420fcd140 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -33,7 +33,6 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
   ArmPkg/ArmPkg.dec\r
   ArmPlatformPkg/ArmPlatformPkg.dec\r
 \r
@@ -52,8 +51,8 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone\r
   \r
 [FixedPcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFdSize\r
 \r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize\r

diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c
index 4de49329d45b9e24fb9fa4b3dfef519abe907d5c..4199f381ba9481d0249f1d4a0370901a7d1bad3e 100644 (file)
--- a/ArmPlatformPkg/Sec/Sec.c
+++ b/ArmPlatformPkg/Sec/Sec.c
@@ -195,7 +195,7 @@ CEntryPoint (
   // If ArmVe has not been built as Standalone then we need to patch the DRAM to add an infinite loop at the start address
   if (FeaturePcdGet(PcdStandalone) == FALSE) {
     if (CoreId == 0) {
-      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdEmbeddedFdBaseAddress);
+      UINTN*   StartAddress = (UINTN*)PcdGet32(PcdNormalFdBaseAddress);
 
       // Patch the DRAM to make an infinite loop at the start address
       *StartAddress = 0xEAFFFFFE; // opcode for while(1)
@@ -204,7 +204,7 @@ CEntryPoint (
       SerialPortWrite ((UINT8 *) Buffer, CharCount);
 
       // To enter into Non Secure state, we need to make a return from exception
-      return_from_exception(PcdGet32(PcdEmbeddedFdBaseAddress));
+      return_from_exception(PcdGet32(PcdNormalFdBaseAddress));
     } 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
@@ -218,7 +218,7 @@ CEntryPoint (
     }
   } else {
     // To enter into Non Secure state, we need to make a return from exception
-    return_from_exception(PcdGet32(PcdEmbeddedFdBaseAddress));
+    return_from_exception(PcdGet32(PcdNormalFdBaseAddress));
   }
   //-------------------- Non Secure Mode ---------------------
 
@@ -232,7 +232,7 @@ VOID NonSecureWaitForFirmware() {
   VOID (*secondary_start)(VOID);
 
   // The secondary cores will execute the fimrware once wake from WFI.
-  secondary_start = (VOID (*)())PcdGet32(PcdEmbeddedFdBaseAddress);
+  secondary_start = (VOID (*)())PcdGet32(PcdNormalFdBaseAddress);
 
   ArmCallWFI();
 

diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index 983d87198e9ffeca4b35850bfc2da60b357ae32f..e3ab22150e9716756b9c6d2d25f3d16c37ac3f67 100644 (file)
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -54,7 +54,7 @@
   gArmTokenSpaceGuid.PcdVFPEnabled
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport
   
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
   
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecStackSize