From f4ee7a82342ea532b2590e5d7fe6195f670e9def Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 22 Sep 2011 23:19:23 +0000
Subject: ArmPlatformPkg/ArmRealViewEbPkg: Introduce 'ArmRealViewEb.dsc.inc' to
 avoid duplication of library and PCD defintions around ARM RealView Emulation
 Boards

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12427 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf              | 4 ++++
 .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c                | 6 +++---
 .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c                | 6 +++---
 .../Library/DebugAgentTimerLib/DebugAgentTimerLib.c                | 1 -
 .../Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf  | 7 -------
 5 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'ArmPlatformPkg/ArmRealViewEbPkg/Library')

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
index a73ba2c8ae..50dfff96ee 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
@@ -37,3 +37,7 @@
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdCacheEnable
+
+[FixedPcd]
+  gArmTokenSpaceGuid.PcdSystemMemoryBase
+  gArmTokenSpaceGuid.PcdSystemMemorySize
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index a5489d06a8..5ca9510a7f 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -68,9 +68,9 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;
 
   // DDR
-  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_DRAM_BASE;
-  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_DRAM_BASE;
-  VirtualMemoryTable[Index].Length       = ARM_EB_DRAM_SZ;
+  VirtualMemoryTable[++Index].PhysicalBase = PcdGet32 (PcdSystemMemoryBase);
+  VirtualMemoryTable[Index].VirtualBase  = PcdGet32 (PcdSystemMemoryBase);
+  VirtualMemoryTable[Index].Length       = PcdGet32 (PcdSystemMemorySize);
   VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;
 
   // SMC CS7
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
index 6c43240406..5eb667d6eb 100755
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSec.c
@@ -34,8 +34,7 @@ ArmPlatformTrustzoneInit (
   VOID
   )
 {
-  //ASSERT(FALSE);
-  DEBUG((EFI_D_ERROR,"Initialize Trustzone Hardware\n"));
+  ASSERT(FALSE);
 }
 
 /**
@@ -48,7 +47,8 @@ ArmPlatformTrustzoneInit (
 VOID
 ArmPlatformSecInitialize (
   VOID
-  ) {
+  )
+{
   // Do nothing yet
 }
 
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c
index e62384217f..06df8663c9 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c
@@ -23,7 +23,6 @@
 
 #include <Library/DebugAgentTimerLib.h>
 
-#include <ArmEb/ArmEb.h>
 
 
 /**
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf
index 54866b2f48..a9955e2ee2 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf
@@ -32,10 +32,3 @@
   BaseLib
   DebugLib
   IoLib
-
-[Guids]
-
-[Protocols]
-
-[Pcd]
-
-- 
cgit v1.2.3