diff options
| author | Ye Li <ye.li@nxp.com> | 2018-06-05 03:30:37 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 15:58:47 +0800 |
| commit | 965bf8e05a285f25574dfc4e5486797c4ae5df26 (patch) | |
| tree | e3533bc4b9ce36eab554dbe670bb4e1cc262a918 /common/board_r.c | |
| parent | ffc105845732e1dd4a8f31b4d104c10f6c3cac1f (diff) | |
MLK-18591-6 android: iot: Add boot Trusty OS codes for i.MX SoCs
Use trusty_os_init to load Trusty OS from CONFIG_TRUSTY_OS_ENTRY
before u-boot ready.
Add Trusty OS SOC level codes and u-boot/SPL common codes.
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
(cherry picked from commit 1ae9ecc73f5001b8bd743011c06a7d07861be64e)
(cherry picked from commit 6fa4f4a42fd90631f8dc8303b17f600c085d8595)
(cherry picked from commit d5046e6f021f3d55c58e8b46b13ac3e8e1761755)
(cherry picked from commit e1588a2741dfd0f37421e13ceb5e310e0b35d3bf)
(cherry picked from commit 6eae7a4c237199be90984f03f5c396e0d63b34f1)
Diffstat (limited to 'common/board_r.c')
| -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 c885e46760..244c22dd6d 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -599,6 +599,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 @@ -822,6 +831,9 @@ static init_fnc_t init_sequence_r[] = { #if defined(AVB_RPMB) && !defined(CONFIG_SPL) initr_avbkey, #endif +#ifdef CONFIG_IMX_TRUSTY_OS + initr_tee_setup, +#endif #ifdef CONFIG_FSL_FASTBOOT initr_check_fastboot, #endif |