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: I3fe0217c858b4cb1e06bd76f829a4f8977370cde
Signed-off-by: Ji Luo <ji.luo@nxp.com>

11 files changed, 27 insertions, 4 deletions

diff --git a/configs/imx8mm_ddr4_evk_android_dual_defconfig b/configs/imx8mm_ddr4_evk_android_dual_defconfig
index a0f006d384..e9438202d5 100755
--- a/configs/imx8mm_ddr4_evk_android_dual_defconfig
+++ b/configs/imx8mm_ddr4_evk_android_dual_defconfig
@@ -60,6 +60,9 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET_SUPPORT=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
 
 CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
diff --git a/configs/imx8mm_evk_1g_ddr_android_dual_defconfig b/configs/imx8mm_evk_1g_ddr_android_dual_defconfig
index 4b93106873..eb66dbdb37 100755
--- a/configs/imx8mm_evk_1g_ddr_android_dual_defconfig
+++ b/configs/imx8mm_evk_1g_ddr_android_dual_defconfig
@@ -60,6 +60,9 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET_SUPPORT=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
 
 CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
diff --git a/configs/imx8mm_evk_4g_android_dual_defconfig b/configs/imx8mm_evk_4g_android_dual_defconfig
index 512b020b5e..6087fc2e01 100755
--- a/configs/imx8mm_evk_4g_android_dual_defconfig
+++ b/configs/imx8mm_evk_4g_android_dual_defconfig
@@ -61,3 +61,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET_SUPPORT=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
diff --git a/configs/imx8mm_evk_4g_android_trusty_dual_defconfig b/configs/imx8mm_evk_4g_android_trusty_dual_defconfig
index fe0e34c4ec..45a92407ee 100755
--- a/configs/imx8mm_evk_4g_android_trusty_dual_defconfig
+++ b/configs/imx8mm_evk_4g_android_trusty_dual_defconfig
@@ -64,3 +64,5 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
diff --git a/configs/imx8mm_evk_android_dual_defconfig b/configs/imx8mm_evk_android_dual_defconfig
index 316e15f7ff..1f0eecd373 100755
--- a/configs/imx8mm_evk_android_dual_defconfig
+++ b/configs/imx8mm_evk_android_dual_defconfig
@@ -60,6 +60,9 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_USB_GADGET_SUPPORT=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_MMC_WRITE=y
 
 CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig
index b18590b0c8..6f7e944afd 100755
--- a/configs/imx8mm_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mm_evk_android_trusty_dual_defconfig
@@ -64,3 +64,5 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=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 a6ae30ebf0..185d3cbf3f 100644
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -70,3 +70,4 @@ CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_LZ4=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 a6ae30ebf0..2d1824b612 100644
--- a/configs/imx8mn_ddr4_evk_android_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_dual_defconfig
@@ -70,3 +70,7 @@ CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_LZ4=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 6e38560d35..1aefe9c25b 100644
--- a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
@@ -69,3 +69,6 @@ CONFIG_LZ4=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_REGEX=n
diff --git a/configs/imx8mq_aiy_android_trusty_dual_defconfig b/configs/imx8mq_aiy_android_trusty_dual_defconfig
index b6abbc5534..4987c0232f 100644
--- a/configs/imx8mq_aiy_android_trusty_dual_defconfig
+++ b/configs/imx8mq_aiy_android_trusty_dual_defconfig
@@ -70,13 +70,10 @@ 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_REGEX=n
 
 CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_IMX_TRUSTY_OS=y
+CONFIG_DUAL_BOOTLOADER=y
diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig
index 38705418ec..70dedd9ed0 100644
--- a/configs/imx8mq_evk_android_dual_defconfig
+++ b/configs/imx8mq_evk_android_dual_defconfig
@@ -79,3 +79,5 @@ CONFIG_USB_DWC3_GADGET=y
 
 CONFIG_NOT_UUU_BUILD=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_LIBDISK_SUPPORT=y