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 /include | |
| 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 'include')
| -rw-r--r-- | include/configs/imx8mm_evk_android.h | 12 | ||||
| -rw-r--r-- | include/fsl_fastboot.h | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h index ce039baa45..1bb37cc3bb 100644 --- a/include/configs/imx8mm_evk_android.h +++ b/include/configs/imx8mm_evk_android.h @@ -62,4 +62,16 @@ #endif #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED +#ifdef CONFIG_IMX_TRUSTY_OS +#define AVB_RPMB +#define KEYSLOT_HWPARTITION_ID 2 +#define KEYSLOT_BLKS 0x1FFF +#define NS_ARCH_ARM64 1 + +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_BLK +#endif + +#endif + #endif /* IMX8MM_EVK_ANDROID_H */ diff --git a/include/fsl_fastboot.h b/include/fsl_fastboot.h index 972b54947f..ad0fce6629 100644 --- a/include/fsl_fastboot.h +++ b/include/fsl_fastboot.h @@ -84,16 +84,14 @@ #endif #ifdef CONFIG_IMX_TRUSTY_OS -#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#ifndef CONFIG_AVB_ATX #define FASTBOOT_SET_RPMB_KEY "set-rpmb-key" #define FASTBOOT_SET_VBMETA_PUBLIC_KEY "set-public-key" #endif -#endif -#if defined(CONFIG_AVB_ATX) || defined(CONFIG_ANDROID_AUTO_SUPPORT) #define FASTBOOT_SET_CA_RESP "at-set-ca-response" #define FASTBOOT_GET_CA_REQ "at-get-ca-request" -#endif /* CONFIG_AVB_ATX || CONFIG_ANDROID_AUTO_SUPPORT */ +#endif #ifdef CONFIG_ANDROID_THINGS_SUPPORT #define FASTBOOT_BOOTLOADER_VBOOT_KEY "fuse at-bootloader-vboot-key" |