diff options
| author | Haoran.Wang <elven.wang@nxp.com> | 2017-10-10 22:46:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-10 22:46:39 +0000 |
| commit | e1dafda9b4b337af2aef710653facaa15f028868 (patch) | |
| tree | 4717b447219c2b4a3d2c2a986f5a11cac62bdd9b | |
| parent | b9d4383bde0c44f0507af467ef4e6ff5341136a6 (diff) | |
| parent | 390e0565f2d0e47a045f1200a08e773748c3e6c6 (diff) | |
| download | uboot-imx-e1dafda9b4b337af2aef710653facaa15f028868.tar.gz | |
[iot] Init ql-tipc after Trusty OS ready
am: 390e0565f2
Change-Id: I3b3a6df4e5bf0568a8abc67fff61144fa71c0453
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 0a73135387..6fbf3daa56 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -35,6 +35,7 @@ #ifdef CONFIG_IMX_TRUSTY_OS extern int armv7_init_nonsec(void); extern void trusty_os_init(void); +#include <trusty/libtipc.h> #endif #ifdef CONFIG_FSL_FASTBOOT @@ -1864,6 +1865,7 @@ void tee_setup(void) #ifdef NON_SECURE_FASTBOOT armv7_init_nonsec(); trusty_os_init(); + trusty_ipc_init(); #endif fail: @@ -2183,6 +2185,10 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (avb_out_data != NULL) avb_slot_verify_data_free(avb_out_data); +#ifdef CONFIG_IMX_TRUSTY_OS + /* put ql-tipc to release resource for Linux */ + trusty_ipc_shutdown(); +#endif do_bootm(NULL, 0, 4, bootm_args); /* This only happens if image is somehow faulty so we start over */ |