diff options
| author | Ji Luo <ji.luo@nxp.com> | 2018-12-10 14:41:23 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2018-12-12 21:36:46 +0800 |
| commit | bcb82557f9731d5ea849400832e80e1589b2aeba (patch) | |
| tree | d575fd7477274f69949025581465406928e072e1 /drivers | |
| parent | 02ae8f8df61540c11b84bd16120ead4a72cd4220 (diff) | |
MA-13759-1 imx8mm: Enable trusty support
Open configs to enable trusty for imx8mm_evk and also
add new config imx8mm_evk_android_trusty_defconfig based
on imx8mm_evk_android_defconfig.
Test: Trusty starts ok.
Change-Id: Iaea90de21f886ed23082a5e8e8d2fa7fb139a9cb
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index f853527345..6dc6ced93b 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -3730,7 +3730,6 @@ static void cb_flashing(struct usb_ep *ep, struct usb_request *req) } #endif /* CONFIG_ANDROID_THINGS_SUPPORT */ #ifdef CONFIG_IMX_TRUSTY_OS -#if defined(CONFIG_AVB_ATX) || defined(CONFIG_ANDROID_AUTO_SUPPORT) else if (endswith(cmd, FASTBOOT_GET_CA_REQ)) { uint8_t *ca_output; uint32_t ca_length, cp_length; @@ -3753,8 +3752,7 @@ static void cb_flashing(struct usb_ep *ep, struct usb_request *req) } else strcpy(response, "OKAY"); } -#endif /* CONFIG_AVB_ATX || CONFIG_ANDROID_AUTO_SUPPORT */ -#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#ifndef CONFIG_AVB_ATX else if (endswith(cmd, FASTBOOT_SET_RPMB_KEY)) { if (fastboot_set_rpmb_key(interface.transfer_buffer, download_bytes)) { printf("ERROR set rpmb key failed!\n"); @@ -3768,7 +3766,7 @@ static void cb_flashing(struct usb_ep *ep, struct usb_request *req) else strcpy(response, "OKAY"); } -#endif /* CONFIG_ANDROID_AUTO_SUPPORT */ +#endif /* !CONFIG_AVB_ATX */ #endif /* CONFIG_IMX_TRUSTY_OS */ else if (endswith(cmd, "unlock_critical")) { strcpy(response, "OKAY"); |