From 3282a71bc28c5edda630165ae949c1ca75d17928 Mon Sep 17 00:00:00 2001 From: "Haoran.Wang" Date: Mon, 28 Aug 2017 18:30:27 +0800 Subject: [PATCH] [iot] Init ql-tipc after Trusty OS ready Init ql-tipc after Trusty OS loaded. Also release ql-tipc before jump to Linux. Change-Id: Idf385eb8ccbf6edbd059a779e347cf062e6be39c Signed-off-by: Haoran.Wang --- drivers/usb/gadget/f_fastboot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 8a9ff91f6c..0b8b018a82 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -32,6 +32,7 @@ #ifdef CONFIG_IMX_TRUSTY_OS extern int armv7_init_nonsec(void); extern void trusty_os_init(void); +#include #endif #ifdef CONFIG_FSL_FASTBOOT @@ -1302,6 +1303,7 @@ void tee_setup(void) #ifdef NON_SECURE_FASTBOOT armv7_init_nonsec(); trusty_os_init(); + trusty_ipc_init(); #endif fail: @@ -1629,6 +1631,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 */ -- 2.17.1