aboutsummaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authorJuan Castillo <juan.castillo@arm.com>2014-09-04 14:43:09 +0100
committerJuan Castillo <juan.castillo@arm.com>2014-10-09 17:15:24 +0100
commitef538c6f1b097d0a115e89aa89fb040d98e6594e (patch)
tree9a5d8406c5ffbccbab224b8c083d6da43989aa12 /bl2
parent7e998c42ce1ffa16101cc712a3b914c311e29788 (diff)
downloadtrusted-firmware-a-ef538c6f1b097d0a115e89aa89fb040d98e6594e.tar.gz
Juno: Use TZC-400 driver calls
This patch replaces direct accesses to the TZC-400 registers by the appropiate calls to the generic driver available in the Trusted Firmware in order to initialize the TrustZone Controller. Functions related to the initialization of the secure memory, like the TZC-400 configuration, have been moved to a new file 'plat_security.c'. This reorganization makes easier to set up the secure memory from any BL stage. TZC-400 initialization has been moved from BL1 to BL2 because BL1 does not access the non-secure memory. It is BL2's responsibility to enable and configure the TZC-400 before loading the next BL images. In Juno, BL3-0 initializes some of the platform peripherals, like the DDR controller. Thus, BL3-0 must be loaded before configuring the TrustZone Controller. As a consequence, the IO layer initialization has been moved to early platform initialization. Fixes ARM-software/tf-issues#234 Change-Id: I83dde778f937ac8d2996f7377e871a2e77d9490e
Diffstat (limited to 'bl2')
-rw-r--r--bl2/bl2_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 51c55e01cf..a73946ed94 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -199,9 +199,6 @@ void bl2_main(void)
/* Perform remaining generic architectural setup in S-EL1 */
bl2_arch_setup();
- /* Perform platform setup in BL2 */
- bl2_platform_setup();
-
/*
* Load the subsequent bootloader images
*/
@@ -211,6 +208,9 @@ void bl2_main(void)
panic();
}
+ /* Perform platform setup in BL2 after loading BL3-0 */
+ bl2_platform_setup();
+
/*
* Get a pointer to the memory the platform has set aside to pass
* information to BL3-1.