diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-28 17:16:58 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-02-28 17:16:58 +0000 |
| commit | 65acd8e7b3f2690f3e927e012fbd21f6bcfb17b2 (patch) | |
| tree | 008649d088181774670d2ffe28e15965adaa789c | |
| parent | f8c9f1c18c7d5630f6b6e633303bc4e8178334f1 (diff) | |
| download | edk2-65acd8e7b3f2690f3e927e012fbd21f6bcfb17b2.tar.gz edk2-65acd8e7b3f2690f3e927e012fbd21f6bcfb17b2.tar.bz2 edk2-65acd8e7b3f2690f3e927e012fbd21f6bcfb17b2.zip | |
ArmPlatformPkg: Moved 'ArmTrustZoneLib' from ArmPkg/Library to ArmPlatformPkg/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
| -rw-r--r-- | ArmPkg/ArmPkg.dsc | 1 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c | 4 | ||||
| -rw-r--r-- | ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.c (renamed from ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c) | 5 | ||||
| -rw-r--r-- | ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.inf (renamed from ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf) | 3 | ||||
| -rw-r--r-- | ArmPlatformPkg/Include/Drivers/ArmTrustzone.h (renamed from ArmPkg/Include/Library/ArmTrustZoneLib.h) | 6 |
6 files changed, 11 insertions, 10 deletions
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index f4989a611c..693dcf69d5 100644 --- 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 index d2c13a9ff7..63d15e84b3 100644 --- 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 index 58a8f7e9da..0cf07a3caf 100644 --- 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/ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c b/ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.c index 8319441f29..26d4004f69 100644 --- a/ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c +++ b/ArmPlatformPkg/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/ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf b/ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.inf index fae82068e6..176224bf46 100644 --- a/ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf +++ b/ArmPlatformPkg/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 b/ArmPlatformPkg/Include/Drivers/ArmTrustzone.h index bcc875495a..da920bdfb5 100644 --- a/ArmPkg/Include/Library/ArmTrustZoneLib.h +++ b/ArmPlatformPkg/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>
|