From 8e06b586e832e4c050eb506c2fadbdca5bf361ff Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 31 Mar 2011 12:12:58 +0000
Subject: ArmPlatformPkg: Introduce ArmPlatformInitialize() function

This function is responsible to handle all the specific platform code that must
be run in secure world to initialize some controllers.


ArmPlatformPkg/Sec: Move the L2x0 initialization to ArmPlatformLib

The L2x0 controller must be initialized in secure world. Move its initialization
into the ArmPlatformInitialize() of the Cortex A9x4 Core Tile PlatformLib.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11476 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPlatformPkg/Sec/Sec.c   | 6 +++---
 ArmPlatformPkg/Sec/Sec.inf | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'ArmPlatformPkg/Sec')

diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c
index 4199f381ba..7106e90026 100644
--- a/ArmPlatformPkg/Sec/Sec.c
+++ b/ArmPlatformPkg/Sec/Sec.c
@@ -21,7 +21,6 @@
 #include <Library/ArmLib.h>
 #include <Chipset/ArmV7.h>
 #include <Drivers/PL390Gic.h>
-#include <Library/L2X0CacheLib.h>
 #include <Library/SerialPortLib.h>
 #include <Library/ArmPlatformLib.h>
 
@@ -106,8 +105,9 @@ CEntryPoint (
   }
 
   if (CoreId == 0) {
-    // Initialize L2X0 but not enabled
-    L2x0CacheInit(PcdGet32(PcdL2x0ControllerBase), FALSE);
+    // Initialize peripherals that must be done at the early stage
+    // Example: Some L2x0 controllers must be initialized in Secure World
+    ArmPlatformInitialize ();
 
     // If we skip the PEI Core we could want to initialize the DRAM in the SEC phase.
     // If we are in standalone, we need the initialization to copy the UEFI firmware into DRAM
diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index e3ab22150e..38bd8b9be3 100644
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -32,7 +32,6 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
 
@@ -42,7 +41,6 @@
   IoLib
   ArmLib
   ArmPlatformLib
-  L2X0CacheLib
   PL390GicSecLib
   SerialPortLib
   
@@ -61,7 +59,5 @@
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize
   
-  gArmTokenSpaceGuid.PcdL2x0ControllerBase
-  
   gArmTokenSpaceGuid.PcdGicDistributorBase
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
-- 
cgit v1.2.3