imx: imx93_{evk, frdm, qsb}: Fix conflict SPL early malloc address

Because the early malloc pool size is set to 0x18000, so using this
start address may cause conflict with ATF, then corrupt the heap data.
So we delete the definition to use the default early malloc pool from
CONFIG_SPL_STACK to avoid any conflict

Signed-off-by: Ye Li <ye.li@nxp.com>
Cherry picked from nxp-imx/uboot-imx commit
1ba675df122627a19debe1d807877052705372c6

Jérémie Dautheribes: applied the same patch to the frdm and qsb
imx93-based boards
Signed-off-by: Jérémie Dautheribes <jeremie.dautheribes@bootlin.com>

diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index e7db0161126ef823174bec200a8d2f43e98a975c..ffd72a38bcbb476ee71fcc910bf3f9ff3fa9c60b 100644 (file)
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@@ -11,10 +11,6 @@
 #define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_XPL_BUILD
-#define CFG_MALLOC_F_ADDR              0x204D0000
-#endif
-
 #ifdef CONFIG_ENV_MMC_DEVICE_INDEX
 #define IMX93_EVK_MMC_ENV_DEV CONFIG_ENV_MMC_DEVICE_INDEX
 #else

diff --git a/include/configs/imx93_frdm.h b/include/configs/imx93_frdm.h
index 987fcacb9999a32e408e4256b4edd548ecfcfeb3..c98c10774cb77cdaee5e7882cfebd1b8e8c72a85 100644 (file)
--- a/include/configs/imx93_frdm.h
+++ b/include/configs/imx93_frdm.h
@@ -11,10 +11,6 @@
 #define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_XPL_BUILD
-#define CFG_MALLOC_F_ADDR              0x204D0000
-#endif
-
 /* Link Definitions */
 
 #define CFG_SYS_INIT_RAM_ADDR          0x80000000

diff --git a/include/configs/imx93_qsb.h b/include/configs/imx93_qsb.h
index 5ddc191d17c632352e16d05963a17a9bd8e42de7..a7b94f7ab57406c6ecaffa873a702edc53cc430f 100644 (file)
--- a/include/configs/imx93_qsb.h
+++ b/include/configs/imx93_qsb.h
@@ -9,10 +9,6 @@
 #define CFG_SYS_UBOOT_BASE     \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_SPL_BUILD
-#define CFG_MALLOC_F_ADDR      0x204D0000
-#endif
-
 #define CFG_SYS_INIT_RAM_ADDR  0x80000000
 #define CFG_SYS_INIT_RAM_SIZE  0x200000