MA-18299 Fix imx8mn flash panic

TEE memory region are moved to 0x56000000 ~ 0x58000000 to
support i.MX 8MN DDR3L board:

    TEE-619 imx: 8mn: add support for i.MX 8MN DDR3L EVK

    DD3L EVK board only has 512MB of DDR.
    move OP-TEE mapping for all the 8MN boards.

    Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>

Adjust the fastboot buffer region to avoid conflicts.

Test: Super partition flash on imx8mn.

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

9 files changed, 17 insertions, 17 deletions

diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig
index 042f404594..8a0be502cf 100644
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_ddr4_evk_android_uuu_defconfig b/configs/imx8mn_ddr4_evk_android_uuu_defconfig
index 90f368fc99..26d91a7e2f 100644
--- a/configs/imx8mn_ddr4_evk_android_uuu_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_uuu_defconfig
@@ -75,8 +75,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_defconfig b/configs/imx8mn_evk_android_defconfig
index 6c47ab3aab..5d6687096a 100644
--- a/configs/imx8mn_evk_android_defconfig
+++ b/configs/imx8mn_evk_android_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_dual_defconfig b/configs/imx8mn_evk_android_dual_defconfig
index 697bc301f7..cbf1a37c2c 100644
--- a/configs/imx8mn_evk_android_dual_defconfig
+++ b/configs/imx8mn_evk_android_dual_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_trusty_defconfig b/configs/imx8mn_evk_android_trusty_defconfig
index 54efcdfa79..f028f5a57b 100644
--- a/configs/imx8mn_evk_android_trusty_defconfig
+++ b/configs/imx8mn_evk_android_trusty_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_trusty_dual_defconfig b/configs/imx8mn_evk_android_trusty_dual_defconfig
index ca85a50e71..0342cf9909 100644
--- a/configs/imx8mn_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_evk_android_trusty_dual_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
index 2ae4be5ff9..c7737a4c0d 100644
--- a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
@@ -74,8 +74,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=n
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/configs/imx8mn_evk_android_uuu_defconfig b/configs/imx8mn_evk_android_uuu_defconfig
index 342c6f14f4..cceaffd4fa 100644
--- a/configs/imx8mn_evk_android_uuu_defconfig
+++ b/configs/imx8mn_evk_android_uuu_defconfig
@@ -75,8 +75,8 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x44800000
-CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0xc800000
 CONFIG_FASTBOOT_FLASH=y
 
 CONFIG_DM_I2C=y
diff --git a/include/configs/imx8mn_evk_android.h b/include/configs/imx8mn_evk_android.h
index 356cdebb2a..4eab9ca71f 100644
--- a/include/configs/imx8mn_evk_android.h
+++ b/include/configs/imx8mn_evk_android.h
@@ -15,7 +15,7 @@
 
 #ifdef CONFIG_SYS_MALLOC_LEN
 #undef CONFIG_SYS_MALLOC_LEN
-#define CONFIG_SYS_MALLOC_LEN           (64 * SZ_1M)
+#define CONFIG_SYS_MALLOC_LEN           (32 * SZ_1M)
 #endif
 
 #undef CONFIG_EXTRA_ENV_SETTINGS