ArmPlatformPkg: Moved 'ArmTrustZoneLib' from ArmPkg/Library to ArmPla…

…tformPkg/Drivers This library is really the driver for the ARM Trustzone controllers (TZPC and TZASC). git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13054 6f19259b-4bc3-4df7-8a09-765794883524
bumfany · Feb 28, 2012 · 65acd8e · 65acd8e
1 parent f8c9f1c
commit 65acd8e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
@@ -100,7 +100,6 @@
   ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
   ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
   ArmPkg/Library/ArmLib/Null/NullArmLib.inf
-  ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
   ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf
   ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -37,7 +37,7 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf
   ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
-  ArmTrustZoneLib|ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
+  ArmTrustZoneLib|ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.inf
 
   # ARM PL310 L2 Cache Driver
   L2X0CacheLib|ArmPlatformPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 *  
 *  This program and the accompanying materials                          
 *  are licensed and made available under the terms and conditions of the BSD License         
@@ -13,12 +13,12 @@
 **/
 
 #include <Library/ArmPlatformLib.h>
-#include <Library/ArmTrustZoneLib.h>
 #include <Library/ArmPlatformSysConfigLib.h>
 #include <Library/DebugLib.h>
 #include <Library/IoLib.h>
 #include <Library/PcdLib.h>
 
+#include <Drivers/ArmTrustzone.h>
 #include <Drivers/PL310L2Cache.h>
 
 #include <ArmPlatform.h>

diff --git a/...kg/Library/ArmTrustZoneLib/ArmTrustZone.c → ...rmPkg/Drivers/ArmTrustZone/ArmTrustZone.c b/...kg/Library/ArmTrustZoneLib/ArmTrustZone.c → ...rmPkg/Drivers/ArmTrustZone/ArmTrustZone.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 *  
 *  This program and the accompanying materials                          
 *  are licensed and made available under the terms and conditions of the BSD License         
@@ -14,7 +14,8 @@
 
 #include <Library/BaseLib.h>
 #include <Library/IoLib.h>
-#include <Library/ArmTrustZoneLib.h>
+
+#include <Drivers/ArmTrustzone.h>
 
 #define TZPC_DECPROT0_STATUS_REG        0x800
 #define TZPC_DECPROT0_SET_REG           0x804

diff --git a/...brary/ArmTrustZoneLib/ArmTrustZoneLib.inf → ...Pkg/Drivers/ArmTrustZone/ArmTrustZone.inf b/...brary/ArmTrustZoneLib/ArmTrustZoneLib.inf → ...Pkg/Drivers/ArmTrustZone/ArmTrustZone.inf
@@ -1,5 +1,5 @@
 #/* @file
-#  Copyright (c) 2011, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 #  
 #  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
@@ -26,6 +26,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   ArmPkg/ArmPkg.dec
+  ArmPlatformPkg/ArmPlatformPkg.dec
 
 [LibraryClasses]
   BaseLib

diff --git a/ArmPkg/Include/Library/ArmTrustZoneLib.h → ...latformPkg/Include/Drivers/ArmTrustzone.h b/ArmPkg/Include/Library/ArmTrustZoneLib.h → ...latformPkg/Include/Drivers/ArmTrustzone.h
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 *  
 *  This program and the accompanying materials                          
 *  are licensed and made available under the terms and conditions of the BSD License         
@@ -12,8 +12,8 @@
 *
 **/
 
-#ifndef __ARM_TRUSTZONE_LIB_H__
-#define __ARM_TRUSTZONE_LIB_H__
+#ifndef __ARM_TRUSTZONE_H__
+#define __ARM_TRUSTZONE_H__
 
 #include <Uefi.h>