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>

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 622df41f54cfbbbdd9c8c1d22e440a1e3fc2a9b1..234652872ecc554a8962a9aff5f8df4bca0e141b 100644 (file)
--- 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;

diff --git a/common/init/board_init.c b/common/init/board_init.c
index 6a550261778d54e0f329ec8ad04540f171994fb4..96ffb79a9869853ba61077565c6ee2b5a8f852bc 100644 (file)
--- 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

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1d2e8fda728482a9c7878951034a73795e18c197..4668367b680f4cdae0acfb7aab5b31d27bb9e857 100644 (file)
--- 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;

diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst
index e6d84036516654dee08c864796895dbeed0d09b4..cd7f8a2cb0dc2a5e77ffb42057696f35fcb50ff4 100644 (file)
--- 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().

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 19c7fca03b295e0f3d364e9e55647e1d3d6055db..9e7322cdb937898e96a94d4d8121fa3e2c71d19a 100644 (file)
--- 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 */
 

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index caa1498acead73a2b560f60973982126e6ece450..a63325973846b90d12cb9d0343f456477cce0f6a 100644 (file)
--- 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
 

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 7785bdc7cbe6cabf0c12e6f30a5d3fb8eb506b6e..64cdc401d039b29ff633f4b49c38c4f21dc2befb 100644 (file)
--- 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

diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index ee524f0e63f22d0b987dd74ea42b1a1ca90ff3a8..d85ae21e23179226bc104d29c44c6d6e1c8c2777 100644 (file)
--- 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

diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 44d74bb1a78813b57458d74fb2146f8e78df13a5..0723d27ab7033f05522fadd9a320ce57c37e27c5 100644 (file)
--- 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 */
 

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index c364e06dc450c7bf9485fdbfc2106e9eecdf9ed9..d5642b96495f34b978140e3d166c24cf02197769 100644 (file)
--- 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

diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index e718daa07c3e4a6bf1765786685664b3ec58e445..2158b0af74f9206432551ea64d69ed524d4bb58c 100644 (file)
--- 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 */
 

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index c490e3829f9adbce4a37664213dd23397d62b0db..5579a05d165fe62b5d8b5e8c2f17550597f860e0 100644 (file)
--- 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 */

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 38ae5f137022b9614af3ae92d11c89dac7037eec..e4e24b522fdb7b2f897e67906f2b22649e4d2b11 100644 (file)
--- 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 \
                                                  */

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f6f356d27ba239f18d7d442b8b51e5ce48a88840..f7ae1b47d0635627114c4701055cb5ee7ef0daa0 100644 (file)
--- 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

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d9ce5d5d0f1a7ea7d8f659344972502eb85ae951..4b46321e851265d53394b7aca1bbd71b1d16e41f 100644 (file)
--- 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

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index eb7059f0648c2f2cdb8ec85d95d08038492824eb..5158f2cc605a5a86e8f3f939c390888a08abe0b5 100644 (file)
--- 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
 

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 7772e71013effba7eae8902d43acdf27d71ba17f..a25efbb16bdb162eb45501868912581ec4a7dc44 100644 (file)
--- 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
 

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 669da591fa2b398592f2975289ba7c7a92962a91..4f55ae49403dd8f93729296939036a3e48ba609b 100644 (file)
--- 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
 

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index b7397f6038fddb554ff1fc4d0a7e458e01a8a153..d77510e1685e45a3709459cc6c9010a6d269e806 100644 (file)
--- 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

diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index 5cd6492dd503f95518850dcbaee44310af24da69..7b7bef3ca755635143e1e57e98a4de3ce276c6b3 100644 (file)
--- 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

diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index e4d6a8a15408589cc64b54da140eb257c89eae79..d80238bd02f2c8ae29b80a0fcba0215939cf7906 100644 (file)
--- 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

diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 4dd51c7f1d7fdc6991ceca54cad5e9b4bc5d74f3..5a3c9f76a431fe7b411142847be46e444ee3969f 100644 (file)
--- 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 */
 
 

diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 0d293f316b7f66ae359145599f8bc1ccf1a9750b..940bfd2b336afa25041121f3c1c63358f27405a7 100644 (file)
--- 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)

diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 9160c78c0464de03f0a454089d0fc2712890490e..ce6dc87c69c71a0e1dc17713927048a24588f4fa 100644 (file)
--- 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
 

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 1d8709180c83bd7aa2c6717d2dddcc964b155933..37ade717ae996ba12095f6e106ddec40408207b0 100644 (file)
--- 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
 

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 8d9af7f088d1d0f7b326d9ce8e4c4f11b854c91b..4e5653dc886ea35d439925ea7473f6329bca185a 100644 (file)
--- 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

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 7f3fa795afdc1add5019df6e233ac19fbc521701..27d7efb883de4f5f4c2741eac92ba76f42986679 100644 (file)
--- 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
 

diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 2cb076cabac9320e67b25b020383ab8276cf4352..942081ab84d71198645699322ca61d6ac67d7874 100644 (file)
--- 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 */