From 2c68a8f6183f20adeca6c68be722a516e510c7f3 Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Thu, 28 Feb 2019 18:11:08 +0800 Subject: [PATCH] MA-14173-1 Enable trusty for imx8mq_aiy Create new config file based on "imx8mq_aiy_android_defconfig" and enable the CONFIG_IMX_TRUSTY_OS to supprt Trusty OS for AIY. Also enlarge the malloc poll to 96 MB because calculate hash with CAAM will consume more heap memory. Test: Trusty OS boots up and CAAM functions work. Change-Id: Ia4bdf4c32617cb4d2951b63f34f3a4a83f4af1b5 Signed-off-by: Ji Luo --- configs/imx8mq_aiy_android_trusty_defconfig | 81 +++++++++++++++++++++ include/configs/imx8mq_aiy_android.h | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 configs/imx8mq_aiy_android_trusty_defconfig diff --git a/configs/imx8mq_aiy_android_trusty_defconfig b/configs/imx8mq_aiy_android_trusty_defconfig new file mode 100644 index 0000000000..1fe10c9c54 --- /dev/null +++ b/configs/imx8mq_aiy_android_trusty_defconfig @@ -0,0 +1,81 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8M=y +CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_IMX8MQ_AIY=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ANDROID_SUPPORT" +CONFIG_EFI_PARTITION=y +CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL=y +CONFIG_SPL_BOARD_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_OF_LIBFDT=y +CONFIG_BOOTDELAY=3 +CONFIG_FS_FAT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mq-aiy" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_OF_CONTROL=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX8M=y +CONFIG_SYS_I2C_MXC=y +CONFIG_CMD_I2C=y +CONFIG_DM_I2C=y +CONFIG_DM_GPIO=y +CONFIG_CMD_GPIO=y +CONFIG_DM_MMC=y +CONFIG_CMD_REGULATOR=y +CONFIG_DM_PMIC=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_PMIC_BD71837=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_ETH=y +CONFIG_CMD_PMIC=y +CONFIG_NXP_TMU=y +CONFIG_DM_THERMAL=y +CONFIG_FIT=y +CONFIG_SPL_FIT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_MMC_WRITE=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_USB_GADGET=y +CONFIG_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_FSL_FASTBOOT=y +CONFIG_BCB_SUPPORT=y +CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_SIZE=0x19000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_IMX8M=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y +CONFIG_CMD_UUID=y +CONFIG_LIB_RAND=y +CONFIG_AVB_SUPPORT=y +CONFIG_SDP_LOADADDR=0x40400000 +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 + +CONFIG_NOT_UUU_BUILD=y +CONFIG_APPEND_BOOTARGS=y +CONFIG_IMX_TRUSTY_OS=y diff --git a/include/configs/imx8mq_aiy_android.h b/include/configs/imx8mq_aiy_android.h index 3e3e802d3b..ef4cb16c90 100644 --- a/include/configs/imx8mq_aiy_android.h +++ b/include/configs/imx8mq_aiy_android.h @@ -27,7 +27,7 @@ #ifdef CONFIG_SYS_MALLOC_LEN #undef CONFIG_SYS_MALLOC_LEN -#define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M) #endif #define CONFIG_ANDROID_RECOVERY