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 /drivers/usb/gadget/fastboot_lock_unlock.c | |
| 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 'drivers/usb/gadget/fastboot_lock_unlock.c')
| -rw-r--r-- | drivers/usb/gadget/fastboot_lock_unlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fastboot_lock_unlock.c b/drivers/usb/gadget/fastboot_lock_unlock.c index 230f892f67..da4b9501e5 100644 --- a/drivers/usb/gadget/fastboot_lock_unlock.c +++ b/drivers/usb/gadget/fastboot_lock_unlock.c @@ -50,7 +50,7 @@ int fastboot_flash_find_index(const char *name); -#ifndef FASTBOOT_ENCRYPT_LOCK +#if !defined(FASTBOOT_ENCRYPT_LOCK) || defined(NON_SECURE_FASTBOOT) /* * This will return FASTBOOT_LOCK, FASTBOOT_UNLOCK or FASTBOOT_ERROR |