From e86c1ff0c95c1ccecd3f6c57139d6e500f1f434d Mon Sep 17 00:00:00 2001 From: Vikram Kanigiri Date: Fri, 31 Jul 2015 14:50:36 +0100 Subject: [PATCH] Re-factor definition of TZC-400 base address This patch replaces the `ARM_TZC_BASE` constant with `PLAT_ARM_TZC_BASE` to support different TrustZone Controller base addresses across ARM platforms. Change-Id: Ie4e1c7600fd7a5875323c7cc35e067de0c6ef6dd --- include/plat/arm/common/arm_def.h | 4 ---- include/plat/arm/css/common/css_def.h | 2 +- plat/arm/board/fvp/include/platform_def.h | 1 + plat/arm/common/arm_security.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 377bfaa2..a22e64ab 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -173,10 +173,6 @@ #define ARM_CONSOLE_BAUDRATE 115200 -/* TZC related constants */ -#define ARM_TZC_BASE 0x2a4a0000 - - /****************************************************************************** * Required platform porting definitions common to all ARM standard platforms *****************************************************************************/ diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 157a22f4..e5005b9a 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -111,6 +111,6 @@ /* TZC related constants */ #define PLAT_ARM_TZC_FILTERS REG_ATTR_FILTER_BIT_ALL - +#define PLAT_ARM_TZC_BASE 0x2a4a0000 #endif /* __CSS_DEF_H__ */ diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index c2a7d6a5..9f42fd26 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -100,6 +100,7 @@ * Give access to the CPUs and Virtio. Some devices * would normally use the default ID so allow that too. */ +#define PLAT_ARM_TZC_BASE 0x2a4a0000 #define PLAT_ARM_TZC_FILTERS REG_ATTR_FILTER_BIT(0) #define PLAT_ARM_TZC_NS_DEV_ACCESS ( \ diff --git a/plat/arm/common/arm_security.c b/plat/arm/common/arm_security.c index 8bee4fef..990d8d4a 100644 --- a/plat/arm/common/arm_security.c +++ b/plat/arm/common/arm_security.c @@ -47,7 +47,7 @@ void arm_tzc_setup(void) { INFO("Configuring TrustZone Controller\n"); - tzc_init(ARM_TZC_BASE); + tzc_init(PLAT_ARM_TZC_BASE); /* Disable filters. */ tzc_disable_filters(); -- 2.30.2