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:02:10 +0800 |
| commit | fc734f07d747eed07c5a9f16120a65d0d86dc3c8 (patch) | |
| tree | 4332b21056e24f0a9cb6243f4e7c339b8246ca1e /common | |
| parent | 8132f6b5848d45cab795bb472d6484130985415d (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 'common')
| -rw-r--r-- | common/spl/spl_mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ae59991824..87e8731130 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -54,7 +54,7 @@ ulong h_spl_load_read(struct spl_load_info *load, ulong sector, return blk_dread(mmc_get_blk_desc(mmc), sector, count, buf); } -#if defined(CONFIG_IMX_TRUSTY_OS) && defined(CONFIG_ANDROID_AUTO_SUPPORT) +#if defined(CONFIG_IMX_TRUSTY_OS) && !defined(CONFIG_AVB_ATX) /* Pre-declaration of check_rpmb_blob. */ int check_rpmb_blob(struct mmc *mmc); #endif @@ -109,7 +109,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, } /* Images loaded, now check the rpmb keyblob for Trusty OS. */ -#if defined(CONFIG_IMX_TRUSTY_OS) && defined(CONFIG_ANDROID_AUTO_SUPPORT) +#if defined(CONFIG_IMX_TRUSTY_OS) && !defined(CONFIG_AVB_ATX) ret = check_rpmb_blob(mmc); #endif return ret; |