diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2019-08-21 21:44:26 +0800 |
|---|---|---|
| committer | faqiang.zhu <faqiang.zhu@nxp.com> | 2019-08-26 12:17:49 +0800 |
| commit | 040c54d77a33b372e82b1dc9a5efc14d94b2efb3 (patch) | |
| tree | 730f4aaf2560616e94f3673e6c9a86487af65320 /include/configs/imx8qm_mek_android.h | |
| parent | 0ee7e430d19b71514589662ce77956ad43bcb7cd (diff) | |
MA-15334-2 enable trusty for imx8q standard Android uboot
"CONFIG_IMX_TRUSTY_OS=y" is added to the corresponding defconfig files
to include trusty related code.
"CONFIG_SPL_ENV_SUPPORT=y" and "CONFIG_SPL_LIBDISK_SUPPORT=y" are added
because "mmc_get_env_dev()" and "blk_get_dev()" are invoked in SPL stage
with trusty related code.
"CONFIG_SHA256=y" is added since SPL will access RPMB now.
MACROs are added in corresponding header files. standard android uboot
has more content than android auto uboot, the uboot malloc pool size is
changed from 76MB to 86MB to make the boot process can be handed over to
kernel without malloc problem.
Change-Id: I7505adeb2e30ddaecc8217cee991e6d7b0785af0
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
Diffstat (limited to 'include/configs/imx8qm_mek_android.h')
| -rw-r--r-- | include/configs/imx8qm_mek_android.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h index d8d7569dca..969c66f504 100644 --- a/include/configs/imx8qm_mek_android.h +++ b/include/configs/imx8qm_mek_android.h @@ -13,6 +13,10 @@ #define CONFIG_CMD_READ #define CONFIG_USB_GADGET_VBUS_DRAW 2 +#ifdef CONFIG_IMX_TRUSTY_OS +#define NS_ARCH_ARM64 1 +#endif + #define CONFIG_ANDROID_AB_SUPPORT #define CONFIG_AVB_SUPPORT #define CONFIG_SUPPORT_EMMC_RPMB @@ -25,6 +29,9 @@ #define CONFIG_FASTBOOT_LOCK #define FSL_FASTBOOT_FB_DEV "mmc" +#define KEYSLOT_HWPARTITION_ID 2 +#define KEYSLOT_BLKS 0x3FFF + #define IMX_LOAD_HDMI_FIMRWARE #define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_64M) #define IMX_HDMITX_FIRMWARE_SIZE 0x20000 @@ -32,7 +39,7 @@ #ifdef CONFIG_SYS_MALLOC_LEN #undef CONFIG_SYS_MALLOC_LEN -#define CONFIG_SYS_MALLOC_LEN (76 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (86 * SZ_1M) #endif #define CONFIG_USB_FUNCTION_FASTBOOT @@ -68,6 +75,17 @@ #define CONFIG_FASTBOOT_BUF_ADDR 0x98000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 +#ifdef CONFIG_IMX_TRUSTY_OS +#define AVB_RPMB + +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_BLK +#define CONFIG_FSL_CAAM_KB +#define CONFIG_SPL_CRYPTO_SUPPORT +#define CONFIG_SYS_FSL_SEC_LE +#endif +#endif + #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED #endif /* IMX8QM_MEK_ANDROID_H */ |