ArmPlatformPkg: remove ArmPlatformInitializeSystemMemory

The function ArmPlatformInitializeSystemMemory() is defined by
ArmPlatformLib, but is only ever called when using the PrePeiCore
flavor of the startup code. Also, none of the remaining upstream
platforms actually implement anything in that function in the first
place. So let's just remove it altogether.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index e282e76667b19910ebeb697554ccb55aa6f133c1..9d47e459eadc967e7369138d450e287bbcc273d4 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -48,7 +48,6 @@
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping|FALSE|BOOLEAN|0x00000012\r
 \r
   gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE|BOOLEAN|0x00000001\r
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping|FALSE|BOOLEAN|0x00000012\r
 \r
   gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE|BOOLEAN|0x00000001\r

-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|FALSE|BOOLEAN|0x00000002\r

   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|FALSE|BOOLEAN|0x00000004\r
 \r
   gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked|FALSE|BOOLEAN|0x0000003C\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|FALSE|BOOLEAN|0x00000004\r
 \r
   gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked|FALSE|BOOLEAN|0x0000003C\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
index 93f4d82f1988fc38ffa63a1e29c89d0a14504fc6..a6ddd1b792c9197b5d00e6ff12d2de7a93d08b71 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
@@ -149,19 +149,6 @@ ArmPlatformInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r

-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  )\r
-{\r
-}\r
-\r

 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r
 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
index 11dd7ff1bfb0e9d6fa89618e7ca45f540cd3cb6f..7760e8252125d070d3edae18e6f312b667e3237e 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
@@ -155,20 +155,6 @@ ArmPlatformInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r

-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  )\r
-{\r
-  // Nothing to do here\r
-}\r
-\r

 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r
 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r

diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
index c74d53506feeba06f4a176c126c8e3a8525f23ac..3ad4c16066b6bcb36738d09924b0ce30a2cb63c4 100644 (file)
--- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
+++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
@@ -111,17 +111,6 @@ ArmPlatformInitialize (
   IN  UINTN                     MpId\r
   );\r
 \r
   IN  UINTN                     MpId\r
   );\r
 \r

-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  );\r
-\r

 /**\r
   Return the Virtual Memory Map of your platform\r
 \r
 /**\r
   Return the Virtual Memory Map of your platform\r
 \r

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
index f80a276a04d6fa6f35ffb5475cf04ab2b64a7a0c..038e955db50afd79eee4f2f03d06ccccea4a9df1 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
@@ -106,20 +106,6 @@ ArmPlatformInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r

-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  )\r
-{\r
-  //TODO: Implement me\r
-}\r
-\r

 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r
 EFI_STATUS\r
 PrePeiCoreGetMpCoreInfo (\r
   OUT UINTN                   *CoreCount,\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index e7880d30b1c85b6381bbb2cb9018cd0653ff7d0a..389a2e6f1abdc19553a074abbc81c3954c292068 100644 (file)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -103,14 +103,6 @@ InitializeMemory (
 \r
   DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Memory Init PEIM Loaded\n"));\r
 \r
 \r
   DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Memory Init PEIM Loaded\n"));\r
 \r

-  //\r
-  // Initialize the System Memory (DRAM)\r
-  //\r
-  if (!FeaturePcdGet (PcdSystemMemoryInitializeInSec)) {\r
-    // In case the DRAM has not been initialized by the secure firmware\r
-    ArmPlatformInitializeSystemMemory ();\r
-  }\r
-\r

   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
   ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ADDRESS);\r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
   ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ADDRESS);\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index 2c14a9c826ffd7f084c7c5721efc22d1afc50973..e9b4ea1114be1c387bf6490edc371f5908780764 100644 (file)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -49,7 +49,6 @@
 \r
 [FeaturePcd]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
 \r
 [FeaturePcd]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r

-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec\r

 \r
 [FixedPcd]\r
   gArmTokenSpaceGuid.PcdFdBaseAddress\r
 \r
 [FixedPcd]\r
   gArmTokenSpaceGuid.PcdFdBaseAddress\r

diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c
index 3b0244004853b42c347f90368fb2457dea1938aa..d8eec72b7c2ca149d0bbc7d7bf19002a7fa40028 100644 (file)
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c
@@ -101,20 +101,6 @@ ArmPlatformInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r

-/**\r
-  Initialize the system (or sometimes called permanent) memory\r
-\r
-  This memory is generally represented by the DRAM.\r
-\r
-**/\r
-VOID\r
-ArmPlatformInitializeSystemMemory (\r
-  VOID\r
-  )\r
-{\r
-  // We do not need to initialize the System Memory on RTSM\r
-}\r
-\r

 VOID\r
 ArmPlatformGetPlatformPpiList (\r
   OUT UINTN                   *PpiListSize,\r
 VOID\r
 ArmPlatformGetPlatformPpiList (\r
   OUT UINTN                   *PpiListSize,\r