diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig
index 97896f6b60..f6c6394a2c 100644
--- a/configs/imx8qm_mek_android_defconfig
+++ b/configs/imx8qm_mek_android_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek"
 CONFIG_SYS_EXTRA_OPTIONS="ANDROID_SUPPORT"
 CONFIG_TARGET_IMX8QM_MEK=y
-CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_TEXT_BASE=0x80060000
 CONFIG_EFI_PARTITION=y
 CONFIG_CMD_IMPORTENV=n
 CONFIG_SYS_MALLOC_F_LEN=0x2000
diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig
index 0a8c3cb7e0..6c6ed80ab0 100644
--- a/configs/imx8qm_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qm_mek_androidauto_trusty_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-auto"
 CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
 CONFIG_TARGET_IMX8QM_MEK=y
-CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_TEXT_BASE=0x80060000
 CONFIG_EFI_PARTITION=y
 CONFIG_CMD_IMPORTENV=n
 CONFIG_SYS_MALLOC_F_LEN=0x2000
diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig
index 184e52e811..d050aabb8f 100644
--- a/configs/imx8qxp_mek_android_defconfig
+++ b/configs/imx8qxp_mek_android_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek"
 CONFIG_SYS_EXTRA_OPTIONS="ANDROID_SUPPORT"
 CONFIG_TARGET_IMX8QXP_MEK=y
-CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_TEXT_BASE=0x80060000
 CONFIG_EFI_PARTITION=y
 CONFIG_CMD_IMPORTENV=n
 CONFIG_SYS_MALLOC_F_LEN=0x2000
diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig
index 0611773513..a9fb4b80a6 100644
--- a/configs/imx8qxp_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek-auto"
 CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
 CONFIG_TARGET_IMX8QXP_MEK=y
-CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_TEXT_BASE=0x80060000
 CONFIG_EFI_PARTITION=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM=y
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index 097a7b4d73..aff3f616dd 100644
--- a/include/configs/imx8qm_mek_android.h
+++ b/include/configs/imx8qm_mek_android.h
@@ -66,6 +66,38 @@
 #define CONFIG_FASTBOOT_BUF_ADDR   0x98000000
 #define CONFIG_FASTBOOT_BUF_SIZE   0x19000000
 
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_NOT_UUU_BUILD)
+/* Change default spl/atf/u-boot address to support partition reboot. */
+#ifdef  CONFIG_SPL_TEXT_BASE
+#undef  CONFIG_SPL_TEXT_BASE
+#define CONFIG_SPL_TEXT_BASE           0x80000000
+#endif
+#ifdef  CONFIG_SPL_STACK
+#undef  CONFIG_SPL_STACK
+#define CONFIG_SPL_STACK               0x8003E000
+#endif
+#ifdef  CONFIG_SPL_BSS_START_ADDR
+#undef  CONFIG_SPL_BSS_START_ADDR
+#define CONFIG_SPL_BSS_START_ADDR      0x80038000
+#endif
+#ifdef  CONFIG_SYS_SPL_MALLOC_START
+#undef  CONFIG_SYS_SPL_MALLOC_START
+#define CONFIG_SYS_SPL_MALLOC_START    0x80020000
+#endif
+#ifdef  CONFIG_MALLOC_F_ADDR
+#undef  CONFIG_MALLOC_F_ADDR
+#define CONFIG_MALLOC_F_ADDR           0x80020000
+#endif
+#ifdef  CONFIG_ATF_TEXT_BASE
+#undef  CONFIG_ATF_TEXT_BASE
+#define CONFIG_ATF_TEXT_BASE           0x80040000
+#endif
+#ifdef  CONFIG_SYS_ATF_START
+#undef  CONFIG_SYS_ATF_START
+#define CONFIG_SYS_ATF_START           0x80040000
+#endif
+#endif
+
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
 
 #endif /* IMX8QM_MEK_ANDROID_H */
diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h
index c0a0683ad3..8781856b03 100644
--- a/include/configs/imx8qm_mek_android_auto.h
+++ b/include/configs/imx8qm_mek_android_auto.h
@@ -120,6 +120,37 @@
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_SPL_CRYPTO_SUPPORT
 #define CONFIG_SYS_FSL_SEC_LE
+
+/* Change default spl/atf/u-boot address to support partition reboot. */
+#ifdef  CONFIG_SPL_TEXT_BASE
+#undef  CONFIG_SPL_TEXT_BASE
+#define CONFIG_SPL_TEXT_BASE           0x80000000
+#endif
+#ifdef  CONFIG_SPL_STACK
+#undef  CONFIG_SPL_STACK
+#define CONFIG_SPL_STACK               0x8003E000
+#endif
+#ifdef  CONFIG_SPL_BSS_START_ADDR
+#undef  CONFIG_SPL_BSS_START_ADDR
+#define CONFIG_SPL_BSS_START_ADDR      0x80038000
+#endif
+#ifdef  CONFIG_SYS_SPL_MALLOC_START
+#undef  CONFIG_SYS_SPL_MALLOC_START
+#define CONFIG_SYS_SPL_MALLOC_START    0x80020000
+#endif
+#ifdef  CONFIG_MALLOC_F_ADDR
+#undef  CONFIG_MALLOC_F_ADDR
+#define CONFIG_MALLOC_F_ADDR           0x80020000
+#endif
+#ifdef  CONFIG_ATF_TEXT_BASE
+#undef  CONFIG_ATF_TEXT_BASE
+#define CONFIG_ATF_TEXT_BASE           0x80040000
+#endif
+#ifdef  CONFIG_SYS_ATF_START
+#undef  CONFIG_SYS_ATF_START
+#define CONFIG_SYS_ATF_START           0x80040000
+#endif
+
 #endif
 
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index 8b0b4bf34d..27f1715b4d 100644
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -61,6 +61,38 @@
 #define CONFIG_FASTBOOT_BUF_ADDR   0x98000000
 #define CONFIG_FASTBOOT_BUF_SIZE   0x19000000
 
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_NOT_UUU_BUILD)
+/* Change default spl/atf/u-boot address to support partition reboot. */
+#ifdef  CONFIG_SPL_TEXT_BASE
+#undef  CONFIG_SPL_TEXT_BASE
+#define CONFIG_SPL_TEXT_BASE           0x80000000
+#endif
+#ifdef  CONFIG_SPL_STACK
+#undef  CONFIG_SPL_STACK
+#define CONFIG_SPL_STACK               0x8003E000
+#endif
+#ifdef  CONFIG_SPL_BSS_START_ADDR
+#undef  CONFIG_SPL_BSS_START_ADDR
+#define CONFIG_SPL_BSS_START_ADDR      0x80038000
+#endif
+#ifdef  CONFIG_SYS_SPL_MALLOC_START
+#undef  CONFIG_SYS_SPL_MALLOC_START
+#define CONFIG_SYS_SPL_MALLOC_START    0x80020000
+#endif
+#ifdef  CONFIG_MALLOC_F_ADDR
+#undef  CONFIG_MALLOC_F_ADDR
+#define CONFIG_MALLOC_F_ADDR           0x80020000
+#endif
+#ifdef  CONFIG_ATF_TEXT_BASE
+#undef  CONFIG_ATF_TEXT_BASE
+#define CONFIG_ATF_TEXT_BASE           0x80040000
+#endif
+#ifdef  CONFIG_SYS_ATF_START
+#undef  CONFIG_SYS_ATF_START
+#define CONFIG_SYS_ATF_START           0x80040000
+#endif
+#endif
+
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
 
 #endif /* IMX8QXP_MEK_ANDROID_H */
diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h
index 1ebd7ff7d0..aff963a224 100644
--- a/include/configs/imx8qxp_mek_android_auto.h
+++ b/include/configs/imx8qxp_mek_android_auto.h
@@ -112,6 +112,37 @@
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_SPL_CRYPTO_SUPPORT
 #define CONFIG_SYS_FSL_SEC_LE
+
+/* Change default spl/atf/u-boot address to support partition reboot. */
+#ifdef  CONFIG_SPL_TEXT_BASE
+#undef  CONFIG_SPL_TEXT_BASE
+#define CONFIG_SPL_TEXT_BASE           0x80000000
+#endif
+#ifdef  CONFIG_SPL_STACK
+#undef  CONFIG_SPL_STACK
+#define CONFIG_SPL_STACK               0x8003E000
+#endif
+#ifdef  CONFIG_SPL_BSS_START_ADDR
+#undef  CONFIG_SPL_BSS_START_ADDR
+#define CONFIG_SPL_BSS_START_ADDR      0x80038000
+#endif
+#ifdef  CONFIG_SYS_SPL_MALLOC_START
+#undef  CONFIG_SYS_SPL_MALLOC_START
+#define CONFIG_SYS_SPL_MALLOC_START    0x80020000
+#endif
+#ifdef  CONFIG_MALLOC_F_ADDR
+#undef  CONFIG_MALLOC_F_ADDR
+#define CONFIG_MALLOC_F_ADDR           0x80020000
+#endif
+#ifdef  CONFIG_ATF_TEXT_BASE
+#undef  CONFIG_ATF_TEXT_BASE
+#define CONFIG_ATF_TEXT_BASE           0x80040000
+#endif
+#ifdef  CONFIG_SYS_ATF_START
+#undef  CONFIG_SYS_ATF_START
+#define CONFIG_SYS_ATF_START           0x80040000
+#endif
+
 #endif
 
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED