From 4463f706986cf6a8a9484ebadc2d22a6ca4eb4b5 Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 22 Sep 2011 23:21:02 +0000
Subject: ArmPlatformPkg/ArmiVExpressPkg: Introduce 'ArmVExpress.dsc.inc' to
 avoid duplication of library and PCD defintions around ARM Versatile Express
 Boards

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12428 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c       | 4 +++-
 .../Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf    | 9 ---------
 .../Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c         | 2 --
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'ArmPlatformPkg/ArmVExpressPkg/Library')

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
index 27ef0a7c5f..e26052a0ca 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
@@ -216,6 +216,9 @@ ArmPlatformSysConfigSetDevice (
 
   // Intercept some functions
   switch(Function) {
+  case SYS_CFG_SCC:
+    MmioWrite32 ((ARM_VE_SCC_BASE + (Device * 4)),Value);
+    return EFI_SUCCESS;
 
   case SYS_CFG_OSC_SITE1:
     Function = SYS_CFG_OSC;
@@ -240,7 +243,6 @@ ArmPlatformSysConfigSetDevice (
   case SYS_CFG_AMP:
   case SYS_CFG_TEMP:
   case SYS_CFG_RESET:
-  case SYS_CFG_SCC:
   case SYS_CFG_SHUTDOWN:
   case SYS_CFG_REBOOT:
   case SYS_CFG_DVIMODE:
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
index 85b17efb39..45af92126b 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
@@ -1,7 +1,5 @@
 #/** @file
 #  
-#  Component discription file for ArmVeGraphicsDxe module
-#  
 #  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -32,10 +30,3 @@
   BaseLib
   DebugLib
   IoLib
-
-[Guids]
-
-[Protocols]
-
-[Pcd]
-
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
index 686e0e1294..cd8680cd45 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
@@ -24,8 +24,6 @@
 
 #include <ArmPlatform.h>
 
-#define PL111_CLCD_SITE ARM_VE_DAUGHTERBOARD_1_SITE
-
 typedef struct {
   UINT32                     Mode;
   UINT32                     HorizontalResolution;
-- 
cgit v1.2.3