global: Migrate CONFIG_MALLOC_F_ADDR to CFG

Perform a simple rename of CONFIG_MALLOC_F_ADDR to CFG_MALLOC_F_ADDR Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 10:04:49 -05:00 · 2022-12-04 10:04:49 -05:00 · dd5b58c491
commit dd5b58c491
parent bd79d3d616
28 changed files with 29 additions and 29 deletions
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[])
 	}

 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+	gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 #if CONFIG_IS_ENABLED(LOG)
 	gd->default_log_level = state->default_log_level;
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@ -78,7 +78,7 @@ __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
+#ifndef CFG_MALLOC_F_ADDR
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
 #endif
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@ -527,8 +527,8 @@ 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;
+#ifdef CFG_MALLOC_F_ADDR
+		gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 		gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
 		gd->malloc_ptr = 0;
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@ -615,7 +615,7 @@ Addr      Config                     Usage
 =======   ========================   ===============================
      0   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
   c000   CONFIG_BLOBLIST_ADDR       Blob list
-  10000   CONFIG_MALLOC_F_ADDR       Early memory allocation
+  10000   CFG_MALLOC_F_ADDR          Early memory allocation
  f0000   CONFIG_PRE_CON_BUF_ADDR    Pre-console buffer
 100000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
                                     as the SPL load buffer in spl_test_load().
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@ -14,7 +14,7 @@

 /* SPL config */
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000

 #endif /* CONFIG_SPL_BUILD */

--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@ -13,7 +13,7 @@

 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000

 #endif

--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@ -16,7 +16,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x912000
+#define CFG_MALLOC_F_ADDR		0x912000
 /* For RAW image gives a error info not panic */

 #endif
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@ -14,7 +14,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */

 #endif
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>

 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000

 /* For RAW image gives a error info not panic */

--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@ -24,7 +24,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */

 #endif
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@ -15,7 +15,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-# define CONFIG_MALLOC_F_ADDR		0x930000
+# define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif /* CONFIG_SPL_BUILD */

--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@ -14,7 +14,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif

 /* Enable Distro Boot */
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@ -24,7 +24,7 @@
 		 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)

 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
+#define CFG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
 						  * GD_FLG_FULL_MALLOC_INIT \
 						  * set \
 						  */
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */

 #endif
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@ -15,7 +15,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */

 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif

--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@ -12,7 +12,7 @@

 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000

 #endif

--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@ -12,7 +12,7 @@

 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000

 #endif

--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@ -12,7 +12,7 @@
 #define CFG_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
+#define CFG_MALLOC_F_ADDR		0x22040000


 #endif
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@ -14,7 +14,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)

 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x204D0000
+#define CFG_MALLOC_F_ADDR		0x204D0000
 #endif

 #ifdef CONFIG_DISTRO_DEFAULTS
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@ -46,7 +46,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif

 #define CFG_EXTRA_ENV_SETTINGS BOOTENV
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@ -16,7 +16,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */


--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@ -28,7 +28,7 @@
 /* generic timer */

 /* early heap for SPL DM */
-#define CONFIG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
+#define CFG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE

 /* serial port */
 #define CFG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@ -16,7 +16,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif

--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE	0x41580000

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif

--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#define CONFIG_MALLOC_F_ADDR		0x0010000
+#define CFG_MALLOC_F_ADDR		0x0010000

 /* Size of our emulated memory */
 #define SB_CONCAT(x, y) x ## y
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@ -14,7 +14,7 @@

 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif

--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@ -16,7 +16,7 @@
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/

 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR				0x184000
+#define CFG_MALLOC_F_ADDR				0x184000
 /* For RAW image gives a error info not panic */

 #endif /* CONFIG_SPL_BUILD */