From 65acd8e7b3f2690f3e927e012fbd21f6bcfb17b2 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Tue, 28 Feb 2012 17:16:58 +0000 Subject: [PATCH] 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 --- ArmPkg/ArmPkg.dsc | 1 - ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 2 +- .../ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c | 4 ++-- .../Drivers/ArmTrustZone}/ArmTrustZone.c | 5 +++-- .../Drivers/ArmTrustZone/ArmTrustZone.inf | 3 ++- .../Include/Drivers/ArmTrustzone.h | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) rename {ArmPkg/Library/ArmTrustZoneLib => ArmPlatformPkg/Drivers/ArmTrustZone}/ArmTrustZone.c (92%) rename ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf => ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.inf (88%) rename ArmPkg/Include/Library/ArmTrustZoneLib.h => ArmPlatformPkg/Include/Drivers/ArmTrustzone.h (92%) 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 -#include #include #include #include #include +#include #include #include diff --git a/ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c b/ArmPlatformPkg/Drivers/ArmTrustZone/ArmTrustZone.c similarity index 92% rename from ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c rename to 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 #include -#include + +#include #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 similarity index 88% rename from ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf rename to 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 similarity index 92% rename from ArmPkg/Include/Library/ArmTrustZoneLib.h rename to 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