diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2018-07-11 17:14:49 +0100 |
|---|---|---|
| committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2018-07-23 16:33:22 +0100 |
| commit | d6a1c4196b68b43a24c08eeae7eb5251c4f572c2 (patch) | |
| tree | 9325676d196deb7712df45d1ca840e11b160a6a7 | |
| parent | 08bde53c10d2382de73ce6219887b8859385c2fc (diff) | |
warp7: caam: Add in the CAAMatf-master+linaro-warp7-pr11-caam
This patch adds the CAAM into the build and calls into the previously
introduced caam_init() function.
The CAAM init done here in ATF is extremely limited, in that only the
job-ring ownership is assigned.
It may be necessary later to do a more comprehensive blitz of the CAAM but,
for now job-ring assignment appears all we need to care about.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
| -rw-r--r-- | plat/nxp/imx7/warp7/platform.mk | 1 | ||||
| -rw-r--r-- | plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/plat/nxp/imx7/warp7/platform.mk b/plat/nxp/imx7/warp7/platform.mk index 3ef180f8..1637074b 100644 --- a/plat/nxp/imx7/warp7/platform.mk +++ b/plat/nxp/imx7/warp7/platform.mk @@ -51,6 +51,7 @@ BL2_SOURCES += common/desc_image_load.c \ plat/nxp/common/csu.c \ plat/nxp/common/io_mux.c \ plat/nxp/common/snvs.c \ + plat/nxp/common/caam.c \ plat/nxp/imx7/warp7/aarch32/warp7_helpers.S \ plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c \ plat/nxp/imx7/warp7/warp7_bl2_mem_params_desc.c \ diff --git a/plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c b/plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c index 09687ed4..1f1d5477 100644 --- a/plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c +++ b/plat/nxp/imx7/warp7/warp7_bl2_el3_setup.c @@ -7,6 +7,7 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> +#include <caam.h> #include <console.h> #include <debug.h> #include <desc_image_load.h> @@ -213,6 +214,9 @@ void bl2_el3_early_platform_setup(u_register_t arg1, u_register_t arg2, /* Open handles to persistent storage */ plat_warp7_io_setup(); + /* Setup higher-level functionality CAAM, RTC etc */ + caam_init(); + /* Print out the expected memory map */ VERBOSE("\tOPTEE 0x%08x-0x%08x\n", WARP7_OPTEE_BASE, WARP7_OPTEE_LIMIT); VERBOSE("\tATF/BL2 0x%08x-0x%08x\n", BL2_RAM_BASE, BL2_RAM_LIMIT); |