MA-15217-2 Enable dual bootloader for imx8m

Open configs to enable dual bootloader feature for imx8m
platforms.

Test: A/B slot switch and spl recovery mode test.

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

diff --git a/configs/imx8mm_evk_android_dual_defconfig b/configs/imx8mm_evk_android_dual_defconfig
index 6fe46c4..853157b 100644 (file)
--- a/configs/imx8mm_evk_android_dual_defconfig
+++ b/configs/imx8mm_evk_android_dual_defconfig
@@ -74,4 +74,5 @@ CONFIG_FASTBOOT_BUF_SIZE=0x19000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
-
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y

diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig
index c5217de..dba513b 100755 (executable)
--- a/configs/imx8mm_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mm_evk_android_trusty_dual_defconfig
@@ -82,3 +82,5 @@ CONFIG_FASTBOOT_BUF_SIZE=0x19000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y

diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig
index 9640372..c41d150 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -87,3 +87,4 @@ CONFIG_APPEND_BOOTARGS=y
 CONFIG_LZ4=y
 CONFIG_LIBAVB=y
 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
+CONFIG_REGEX=n

diff --git a/configs/imx8mn_ddr4_evk_android_dual_defconfig b/configs/imx8mn_ddr4_evk_android_dual_defconfig
index ec13edd..6843cfb 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_dual_defconfig
@@ -86,3 +86,7 @@ CONFIG_APPEND_BOOTARGS=y
 CONFIG_LZ4=y
 CONFIG_LIBAVB=y
 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
+CONFIG_REGEX=n
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
index c9bc61d..22af5cf 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
@@ -87,3 +87,6 @@ CONFIG_LIBAVB=y
 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_REGEX=n
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y

diff --git a/configs/imx8mq_aiy_android_trusty_dual_defconfig b/configs/imx8mq_aiy_android_trusty_dual_defconfig
index 6c01a95..b58b204 100644 (file)
--- a/configs/imx8mq_aiy_android_trusty_dual_defconfig
+++ b/configs/imx8mq_aiy_android_trusty_dual_defconfig
@@ -86,4 +86,4 @@ CONFIG_REGEX=n
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_AVB_SUPPORT=y
-
+CONFIG_DUAL_BOOTLOADER=y

diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig
index 300b4c7..0b3ce68 100644 (file)
--- a/configs/imx8mq_evk_android_dual_defconfig
+++ b/configs/imx8mq_evk_android_dual_defconfig
@@ -86,4 +86,6 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
-
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y

diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h
index 23891cf..d3db4af 100644 (file)
--- a/include/configs/imx8mm_evk_android.h
+++ b/include/configs/imx8mm_evk_android.h
@@ -49,17 +49,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
-#define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
+
+#ifdef CONFIG_DUAL_BOOTLOADER
+#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
+
+#ifdef CONFIG_IMX_TRUSTY_OS
+#define BOOTLOADER_RBIDX_OFFSET  0x3FE000
+#define BOOTLOADER_RBIDX_START   0x3FF000
+#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
 
 /* Enable CONFIG_ANDROID_LOW_MEMORY to config 1GB ddr */
@@ -77,5 +87,6 @@
 #define CONFIG_NR_DRAM_BANKS 2
 #endif
 
+#define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
 
 #endif /* IMX8MM_EVK_ANDROID_H */

diff --git a/include/configs/imx8mn_evk_android.h b/include/configs/imx8mn_evk_android.h
index fa12760..c21647f 100644 (file)
--- a/include/configs/imx8mn_evk_android.h
+++ b/include/configs/imx8mn_evk_android.h
@@ -49,17 +49,29 @@
 #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
-#define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
+
+#ifdef CONFIG_DUAL_BOOTLOADER
+#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
+
+#ifdef CONFIG_IMX_TRUSTY_OS
+#define BOOTLOADER_RBIDX_OFFSET  0x3FE000
+#define BOOTLOADER_RBIDX_START   0x3FF000
+#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
+
 #endif /* IMX8MN_EVK_ANDROID_H */

diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index ea76aeb..b56bd8f 100644 (file)
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -51,6 +51,11 @@
 #ifdef CONFIG_FSL_CAAM_KB
 #undef CONFIG_FSL_CAAM_KB
 #endif
+
+#ifdef CONFIG_DUAL_BOOTLOADER
+#define CONFIG_SPL_MMC_WRITE 1
+#endif
+
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
 
 #endif /* IMX8MQ_EVK_ANDROID_H */