From cc1e814923eb231e18f157b0271eab336d6a0e1a Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 30 Aug 2011 16:54:48 +0000
Subject: ArmPlatformPkg: Fix ARM RealView EB and VE builds

Tested with RVCTLINUX and ARMGCC toolchains.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12233 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c   | 29 ----------------------
 .../ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf   |  4 +++
 2 files changed, 4 insertions(+), 29 deletions(-)

(limited to 'ArmPlatformPkg/ArmRealViewEbPkg/Library')

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c
index 5709ca6c01..a245c239aa 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c
@@ -42,21 +42,6 @@ ArmPlatformTrustzoneSupported (
   return FALSE;
 }
 
-/**
-  Initialize the Secure peripherals and memory regions
-
-  If Trustzone is supported by your platform then this function makes the required initialization
-  of the secure peripherals and memory regions.
-
-**/
-VOID
-ArmPlatformTrustzoneInit (
-  VOID
-  )
-{
-  ASSERT(FALSE);
-}
-
 /**
   Remap the memory at 0x0
 
@@ -87,20 +72,6 @@ ArmPlatformGetBootMode (
   return BOOT_WITH_FULL_CONFIGURATION;
 }
 
-/**
-  Initialize controllers that must setup at the early stage
-
-  Some peripherals must be initialized in Secure World.
-  For example, some L2x0 requires to be initialized in Secure World
-
-**/
-VOID
-ArmPlatformSecInitialize (
-  VOID
-  ) {
-  // Do nothing yet
-}
-
 /**
   Initialize controllers that must setup in the normal world
 
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index 60b40074e5..17df8100a4 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -32,6 +32,7 @@
 
 [Sources.common]
   ArmRealViewEb.c
+  ArmRealViewEbSec.c
   ArmRealViewEbHelper.asm   | RVCT
   ArmRealViewEbHelper.S     | GCC
   ArmRealViewEbBoot.asm     | RVCT
@@ -39,3 +40,6 @@
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
+
+[FixedPcd]
+  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
-- 
cgit v1.2.3