MA-15259-1 Enable trusty for imx8mq_evk

Open configs to enable trusty for imx8mq_evk.

Test: build and boot on imx8mq_evk.

Change-Id: I4770ddeabfe5f97e4c74324c3e2bbdb5ea9b8bde
Signed-off-by: Ji Luo <ji.luo@nxp.com>

diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig
index 300b4c7..8264f13 100644 (file)
--- a/configs/imx8mq_evk_android_trusty_defconfig
+++ b/configs/imx8mq_evk_android_trusty_defconfig
@@ -86,4 +86,4 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
-
+CONFIG_IMX_TRUSTY_OS=y

diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig
index 0b3ce68..c33f04b 100644 (file)
--- a/configs/imx8mq_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mq_evk_android_trusty_dual_defconfig
@@ -89,3 +89,4 @@ CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_IMX_TRUSTY_OS=y

diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index b56bd8f..01aa28c 100644 (file)
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -48,12 +48,27 @@
 #define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
 #endif
 
-#ifdef CONFIG_FSL_CAAM_KB
+#if !defined(CONFIG_IMX_TRUSTY_OS) || !defined(CONFIG_DUAL_BOOTLOADER)
 #undef CONFIG_FSL_CAAM_KB
 #endif
 
 #ifdef CONFIG_DUAL_BOOTLOADER
 #define CONFIG_SPL_MMC_WRITE 1
+
+#ifdef CONFIG_IMX_TRUSTY_OS
+#define BOOTLOADER_RBIDX_OFFSET  0x1E000
+#define BOOTLOADER_RBIDX_START   0x1F000
+#define BOOTLOADER_RBIDX_LEN     0x08
+#define BOOTLOADER_RBIDX_INITVAL 0
+#endif
+
+#endif
+
+#ifdef CONFIG_IMX_TRUSTY_OS
+#define AVB_RPMB
+#define KEYSLOT_HWPARTITION_ID 2
+#define KEYSLOT_BLKS             0x1FFF
+#define NS_ARCH_ARM64 1
 #endif
 
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED