Convert CONFIG_MALLOC_F_ADDR to Kconfig.
The CL IoT gate board used MALLOC_F_ADDR 0x912000 on i.MX8M Mini unlike
all the other platforms which use 0x930000 . This has been aligned with
the other i.MX8M Mini platforms.
Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Fabio Estevam <feste...@denx.de>
Cc: Kirill Kapranov <kirill.kapra...@compulab.co.il>
Cc: Peng Fan <peng....@nxp.com>
Cc: Peter Robinson <pbrobin...@gmail.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Stefano Babic <sba...@denx.de>
Cc: Tom Rini <tr...@konsulko.com>
Cc: Uri Mashiach <uri.mashi...@compulab.co.il>
Cc: Valentin Raevsky <valen...@compulab.co.il>
Cc: Ying-Chun Liu (PaulLiu) <paul....@linaro.org>
---
Kconfig | 44 +++++++++++++++++++++
arch/sandbox/cpu/start.c | 4 +-
common/init/board_init.c | 4 +-
common/spl/spl.c | 4 +-
include/configs/capricorn-common.h | 2 -
include/configs/cgtqmx8.h | 1 -
include/configs/imx8mm-cl-iot-gate.h | 7 ----
include/configs/imx8mm_beacon.h | 7 ----
include/configs/imx8mm_data_modul_edm_sbc.h | 7 ----
include/configs/imx8mm_evk.h | 7 ----
include/configs/imx8mm_icore_mx8mm.h | 6 ---
include/configs/imx8mm_venice.h | 7 ----
include/configs/imx8mn_beacon.h | 8 ----
include/configs/imx8mp_rsb3720.h | 5 ---
include/configs/imx8mq_cm.h | 5 ---
include/configs/imx8mq_evk.h | 4 --
include/configs/imx8mq_phanbell.h | 4 --
include/configs/imx8qm_mek.h | 1 -
include/configs/imx8qxp_mek.h | 1 -
include/configs/imx8ulp_evk.h | 6 ---
include/configs/kontron-sl-mx8mm.h | 5 ---
include/configs/kontron_pitx_imx8m.h | 5 ---
include/configs/kontron_sl28.h | 5 ---
include/configs/phycore_imx8mm.h | 6 ---
include/configs/pico-imx8mq.h | 4 --
include/configs/sandbox.h | 2 -
include/configs/verdin-imx8mm.h | 6 ---
include/configs/verdin-imx8mp.h | 6 ---
scripts/config_whitelist.txt | 1 -
29 files changed, 47 insertions(+), 127 deletions(-)
diff --git a/Kconfig b/Kconfig
index 991b260182e..495a560d6bc 100644
--- a/Kconfig
+++ b/Kconfig
@@ -286,6 +286,23 @@ config SYS_MALLOC_F
particular needs this to operate, so that it can allocate the
initial serial device and any others that are needed.
+config MALLOC_F_ADDR
+ hex "Address of malloc() pool before relocation"
+ depends on SYS_MALLOC_F
+ default 0x120000 if ARCH_IMX8
+ default 0x182000 if ARCH_IMX8M && IMX8MQ
+ default 0x930000 if ARCH_IMX8M && IMX8MM
+ default 0x184000 if ARCH_IMX8M && IMX8MN
+ default 0x184000 if ARCH_IMX8M && IMX8MP
+ default 0x22040000 if ARCH_IMX8ULP
+ default 0x18000000 if ARCH_LS1028A
+ default 0x10000 if SANDBOX
+ default 0x0
+ help
+ Before relocation, memory is very limited on many platforms. Still,
+ we can provide a small malloc() pool if needed. This option selects
+ placement of early malloc pool.
+
config SYS_MALLOC_F_LEN
hex "Size of malloc() pool before relocation"
depends on SYS_MALLOC_F
@@ -320,6 +337,15 @@ config SYS_MALLOC_LEN
This defines memory to be allocated for Dynamic allocation
TODO: Use for other architectures
+config SPL_MALLOC_F_ADDR
+ hex "Address of malloc() pool before relocation in SPL"
+ depends on SYS_MALLOC_F && SPL
+ default MALLOC_F_ADDR
+ help
+ Before relocation, memory is very limited on many platforms. Still,
+ we can provide a small malloc() pool if needed. This option selects
+ placement of early malloc pool in SPL.
+
config SPL_SYS_MALLOC_F_LEN
hex "Size of malloc() pool in SPL"
depends on SYS_MALLOC_F && SPL
@@ -335,6 +361,15 @@ config SPL_SYS_MALLOC_F_LEN
It is possible to enable CONFIG_SYS_SPL_MALLOC_START to start a new
malloc() region in SDRAM once it is inited.
+config TPL_MALLOC_F_ADDR
+ hex "Address of malloc() pool before relocation in TPL"
+ depends on SYS_MALLOC_F && TPL
+ default SPL_MALLOC_F_ADDR
+ help
+ Before relocation, memory is very limited on many platforms. Still,
+ we can provide a small malloc() pool if needed. This option selects
+ placement of early malloc pool in TPL.
+
config TPL_SYS_MALLOC_F_LEN
hex "Size of malloc() pool in TPL"
depends on SYS_MALLOC_F && TPL
@@ -360,6 +395,15 @@ config VALGRIND
it can be handled accurately by Valgrind. If you aren't planning on
using valgrind to debug U-Boot, say 'n'.
+config VPL_MALLOC_F_ADDR
+ hex "Address of malloc() pool before relocation in VPL"
+ depends on SYS_MALLOC_F && VPL
+ default MALLOC_F_ADDR
+ help
+ Before relocation, memory is very limited on many platforms. Still,
+ we can provide a small malloc() pool if needed. This option selects
+ placement of early malloc pool in VPL.
+
config VPL_SYS_MALLOC_F_LEN
hex "Size of malloc() pool in VPL before relocation"
depends on SYS_MALLOC_F && VPL
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 90a84e93c79..aad983d7b78 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -506,9 +506,7 @@ int sandbox_main(int argc, char *argv[])
goto err;
}
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
- gd->malloc_base = CONFIG_MALLOC_F_ADDR;
-#endif
+ gd->malloc_base = CONFIG_VAL(MALLOC_F_ADDR);
#if CONFIG_IS_ENABLED(LOG)
gd->default_log_level = state->default_log_level;
#endif
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 6a550261778..35506f2ed35 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -78,10 +78,8 @@ __weak void board_init_f_init_stack_protection(void)
ulong board_init_f_alloc_reserve(ulong top)
{
/* Reserve early malloc arena */
-#ifndef CONFIG_MALLOC_F_ADDR
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
+#if CONFIG_VAL(MALLOC_F_ADDR) && CONFIG_VAL(SYS_MALLOC_F_LEN)
top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
-#endif
#endif
/* LAST : reserve GD (rounded up to a multiple of 16 bytes) */
top = rounddown(top-sizeof(struct global_data), 16);
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 29e0898f03d..2b0b6584924 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -503,9 +503,7 @@ static int spl_common_init(bool setup_malloc)
#if CONFIG_VAL(SYS_MALLOC_F_LEN)
if (setup_malloc) {
-#ifdef CONFIG_MALLOC_F_ADDR
- gd->malloc_base = CONFIG_MALLOC_F_ADDR;
-#endif
+ gd->malloc_base = CONFIG_VAL(MALLOC_F_ADDR);
gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
gd->malloc_ptr = 0;
}
diff --git a/include/configs/capricorn-common.h
b/include/configs/capricorn-common.h
index 6b1e82ad3b1..0de739c0013 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -17,8 +17,6 @@
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_MALLOC_F_ADDR 0x00120000
-
#endif /* CONFIG_SPL_BUILD */
/* ENET1 connects to base board and MUX with ESAI */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 6ac84878519..5dede78bc48 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -15,7 +15,6 @@
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
-#define CONFIG_MALLOC_F_ADDR 0x00120000
#endif
diff --git a/include/configs/imx8mm-cl-iot-gate.h
b/include/configs/imx8mm-cl-iot-gate.h
index c69f2fa19f3..58687bc311f 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -15,13 +15,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x912000
-/* For RAW image gives a error info not panic */
-
-#endif
-
/* GUIDs for capsule updatable firmware images */
#define IMX8MM_CL_IOT_GATE_FIT_IMAGE_GUID \
EFI_GUID(0x7a32a939, 0xab92, 0x467b, 0x91, 0x52, \
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 79ed3971225..71ca414bc01 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -13,13 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-
-#endif
-
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h
b/include/configs/imx8mm_data_modul_edm_sbc.h
index fb05958bdc8..69efab257dc 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -12,13 +12,6 @@
#define CONFIG_SYS_MONITOR_LEN SZ_1M
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR 0x930000
-
-/* For RAW image gives a error info not panic */
-
-#endif
-
/* Link Definitions */
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x200000
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 5e9e3e800d8..06d9837d39e 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -14,13 +14,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-
-#endif
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 2) \
diff --git a/include/configs/imx8mm_icore_mx8mm.h
b/include/configs/imx8mm_icore_mx8mm.h
index 6b7f3af53a2..46971bdbf81 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -14,12 +14,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-# define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-#endif /* CONFIG_SPL_BUILD */
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 2) \
func(MMC, mmc, 0)
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 13015604509..e61bc304310 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -13,13 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-
-#endif
-
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"fdt_addr_r=0x50200000\0" \
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 6faecbde776..930b11b75e7 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -13,14 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x184000
-
-/* For RAW image gives a error info not panic */
-
-#endif /* CONFIG_SPL_BUILD */
-
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 17e00f958b6..a7d5c85e856 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -25,11 +25,6 @@
0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
#ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR 0x184000 /* malloc f used before \
- * GD_FLG_FULL_MALLOC_INIT \
- * set \
- */
-
#if defined(CONFIG_NAND_BOOT)
#define CONFIG_SPL_NAND_MXS
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index ab74d5b26b6..e914cfc01a0 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -14,11 +14,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
-
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x182000
-/* For RAW image gives a error info not panic */
-
#endif
/* ENET Config */
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index ea4305667f2..48a50544040 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -16,10 +16,6 @@
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x182000
-/* For RAW image gives a error info not panic */
-
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
#endif
diff --git a/include/configs/imx8mq_phanbell.h
b/include/configs/imx8mq_phanbell.h
index 97bd5044501..28add2025b0 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -14,10 +14,6 @@
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
-
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x182000
-/* For RAW image gives a error info not panic */
#endif
/* ENET Config */
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 5f9d06e0f6f..100873de58b 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -14,7 +14,6 @@
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
-#define CONFIG_MALLOC_F_ADDR 0x00120000
#endif
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index f8ec16ebb19..cb7c6fa6f5d 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -14,7 +14,6 @@
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000
-#define CONFIG_MALLOC_F_ADDR 0x00120000
#endif
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index ebfc166b4d4..a1eac5cad58 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -12,12 +12,6 @@
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE +
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR 0x22040000
-
-
-#endif
-
/* ENET Config */
#if defined(CONFIG_FEC_MXC)
#define PHY_ANEG_TIMEOUT 20000
diff --git a/include/configs/kontron-sl-mx8mm.h
b/include/configs/kontron-sl-mx8mm.h
index 622ab597624..3ae3e83a867 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -45,11 +45,6 @@
#undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-#endif
-
#define ENV_MEM_LAYOUT_SETTINGS \
"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=0x42000000\0" \
diff --git a/include/configs/kontron_pitx_imx8m.h
b/include/configs/kontron_pitx_imx8m.h
index d77e4b4e100..c7ba1e90898 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -17,11 +17,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x182000
-/* For RAW image gives a error info not panic */
-
-
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
#endif
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 2373abf3e31..558774d9644 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -30,11 +30,6 @@
/* SMP */
#define CPU_RELEASE_ADDR secondary_boot_addr
-/* generic timer */
-
-/* early heap for SPL DM */
-#define CONFIG_MALLOC_F_ADDR CONFIG_SYS_FSL_OCRAM_BASE
-
/* serial port */
#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 049d1d74345..94bb71355e0 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -15,12 +15,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR *
512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-#endif
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"image=Image\0" \
"console=ttymxc2,115200\0" \
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index d1cc1b9d63f..905d84066b8 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -14,10 +14,6 @@
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
-
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x182000
-/* For RAW image gives a error info not panic */
#endif
/* ENET Config */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 5168e2fa353..38c8337164f 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -8,8 +8,6 @@
#define CONFIG_IO_TRACE
-#define CONFIG_MALLOC_F_ADDR 0x0010000
-
/* GUIDs for capsule updatable firmware images */
#define SANDBOX_UBOOT_IMAGE_GUID \
EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 5b5fce9bda1..f4289d2cf78 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -13,12 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x930000
-/* For RAW image gives a error info not panic */
-#endif
-
#define MEM_LAYOUT_ENV_SETTINGS \
"fdt_addr_r=0x44000000\0" \
"kernel_addr_r=0x42000000\0" \
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index fca40beba18..0aa61735284 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -14,12 +14,6 @@
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD
-/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-
-/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR 0x184000
-/* For RAW image gives a error info not panic */
-
#define CONFIG_POWER_PCA9450
#define CONFIG_SYS_I2C
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0a2b8179d49..f02f546d942 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -298,7 +298,6 @@ CONFIG_LPC32XX_NAND_SLC_WSETUP
CONFIG_LPC32XX_NAND_SLC_WWIDTH
CONFIG_LS102XA_STREAM_ID
CONFIG_MACB_SEARCH_PHY
-CONFIG_MALLOC_F_ADDR
CONFIG_MALTA
CONFIG_MAX_DSP_CPUS
CONFIG_MAX_MEM_MAPPED
--
2.35.1
