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.

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 90MB to make the boot process can be handed over to
kernel without malloc problem.

Change-Id: I5072c20aa28fb1da93e889bb920955d2f1cfbefd
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>

diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig
index 5c88c5a..b5dffe2 100644 (file)
--- a/configs/imx8qm_mek_android_trusty_defconfig
+++ b/configs/imx8qm_mek_android_trusty_defconfig
@@ -146,4 +146,5 @@ CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x01000000
 CONFIG_LZ4=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_LIBAVB=y
+CONFIG_IMX_TRUSTY_OS=y
 

diff --git a/configs/imx8qxp_mek_android_trusty_defconfig b/configs/imx8qxp_mek_android_trusty_defconfig
index 1612164..8a7f939 100644 (file)
--- a/configs/imx8qxp_mek_android_trusty_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_defconfig
@@ -150,4 +150,5 @@ CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x00800000
 CONFIG_LZ4=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_LIBAVB=y
+CONFIG_IMX_TRUSTY_OS=y
 

diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index d4fbef7..c1df633 100644 (file)
--- 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           (90 * SZ_1M)
 #endif
 
 
@@ -53,6 +60,17 @@
        "initrd_high=0xffffffffffffffff\0" \
        "panel=NULL\0" \
 
+#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 */

diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index 9251098..20b9fe6 100644 (file)
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_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,9 +29,12 @@
 #define CONFIG_FASTBOOT_LOCK
 #define FSL_FASTBOOT_FB_DEV "mmc"
 
+#define KEYSLOT_HWPARTITION_ID   2
+#define KEYSLOT_BLKS             0x3FFF
+
 #ifdef CONFIG_SYS_MALLOC_LEN
 #undef CONFIG_SYS_MALLOC_LEN
-#define CONFIG_SYS_MALLOC_LEN           (76 * SZ_1M)
+#define CONFIG_SYS_MALLOC_LEN           (90 * SZ_1M)
 #endif
 
 #define CONFIG_FASTBOOT_USB_DEV 1
@@ -46,6 +53,17 @@
        "initrd_high=0xffffffffffffffff\0" \
        "panel=NULL\0" \
 
+#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 /* IMX8QXP_MEK_ANDROID_H */