summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorfaqiang.zhu <faqiang.zhu@nxp.com>2019-08-21 21:44:26 +0800
committerfaqiang.zhu <faqiang.zhu@nxp.com>2019-08-26 12:17:49 +0800
commit040c54d77a33b372e82b1dc9a5efc14d94b2efb3 (patch)
tree730f4aaf2560616e94f3673e6c9a86487af65320 /configs
parent0ee7e430d19b71514589662ce77956ad43bcb7cd (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 'configs')
-rw-r--r--configs/imx8qm_mek_android_trusty_defconfig5
-rw-r--r--configs/imx8qxp_mek_android_trusty_defconfig5
2 files changed, 10 insertions, 0 deletions
diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig
index a5816488b0..0a22576447 100644
--- a/configs/imx8qm_mek_android_trusty_defconfig
+++ b/configs/imx8qm_mek_android_trusty_defconfig
@@ -94,3 +94,8 @@ CONFIG_APPEND_BOOTARGS=y
CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000
+
+CONFIG_IMX_TRUSTY_OS=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SHA256=y
diff --git a/configs/imx8qxp_mek_android_trusty_defconfig b/configs/imx8qxp_mek_android_trusty_defconfig
index 1915b5de18..8c668c322f 100644
--- a/configs/imx8qxp_mek_android_trusty_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_defconfig
@@ -98,3 +98,8 @@ CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000
CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000
+
+CONFIG_IMX_TRUSTY_OS=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SHA256=y