diff options
| author | Ye Li <ye.li@nxp.com> | 2018-06-05 03:30:37 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-06-13 03:06:47 -0700 |
| commit | 1ae9ecc73f5001b8bd743011c06a7d07861be64e (patch) | |
| tree | c21c3be2086184462e35e8b63fe615110dbc22e5 /common | |
| parent | ce4e9dc35ff89a2429224ae6d0ffb4109cb42e28 (diff) | |
MLK-18591-6 android: iot: Add boot Trusty OS codes for imx6 and imx7
Use trusty_os_init to load Trusty OS from CONFIG_TRUSTY_OS_ENTRY
before u-boot ready.
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index 6d6adc13a9..f9cd2e26a0 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -676,6 +676,15 @@ static int initr_check_fastboot(void) } #endif +#ifdef CONFIG_IMX_TRUSTY_OS +extern void tee_setup(void); +static int initr_tee_setup(void) +{ + tee_setup(); + return 0; +} +#endif + static int run_main_loop(void) { #ifdef CONFIG_SANDBOX @@ -893,6 +902,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef AVB_RPMB initr_avbkey, #endif +#ifdef CONFIG_IMX_TRUSTY_OS + initr_tee_setup, +#endif #ifdef CONFIG_FSL_FASTBOOT initr_check_fastboot, #endif |