diff options
| author | Juan Castillo <juan.castillo@arm.com> | 2014-09-04 14:43:09 +0100 |
|---|---|---|
| committer | Juan Castillo <juan.castillo@arm.com> | 2014-10-09 17:15:24 +0100 |
| commit | ef538c6f1b097d0a115e89aa89fb040d98e6594e (patch) | |
| tree | 9a5d8406c5ffbccbab224b8c083d6da43989aa12 /plat/juno/platform.mk | |
| parent | 7e998c42ce1ffa16101cc712a3b914c311e29788 (diff) | |
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 'plat/juno/platform.mk')
| -rw-r--r-- | plat/juno/platform.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plat/juno/platform.mk b/plat/juno/platform.mk index 4746536..2ac756e 100644 --- a/plat/juno/platform.mk +++ b/plat/juno/platform.mk @@ -47,10 +47,12 @@ BL1_SOURCES += drivers/arm/cci400/cci400.c \ plat/juno/aarch64/plat_helpers.S \ plat/juno/aarch64/juno_common.c -BL2_SOURCES += lib/locks/bakery/bakery_lock.c \ +BL2_SOURCES += drivers/arm/tzc400/tzc400.c \ + lib/locks/bakery/bakery_lock.c \ plat/common/aarch64/platform_up_stack.S \ plat/juno/bl2_plat_setup.c \ plat/juno/mhu.c \ + plat/juno/plat_security.c \ plat/juno/aarch64/plat_helpers.S \ plat/juno/aarch64/juno_common.c \ plat/juno/scp_bootloader.c \ |