Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

global: Migrate CONFIG_MALLOC_F_ADDR to CFG

Browse source 
Perform a simple rename of CONFIG_MALLOC_F_ADDR to CFG_MALLOC_F_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:04:49 -05:00
parent bd79d3d616
commit dd5b58c491
28 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sandbox/cpu/start.c
View file

@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[])
} }
#if CONFIG_VAL(SYS_MALLOC_F_LEN) #if CONFIG_VAL(SYS_MALLOC_F_LEN)
gd->malloc_base = CONFIG_MALLOC_F_ADDR; gd->malloc_base = CFG_MALLOC_F_ADDR;
#endif #endif
#if CONFIG_IS_ENABLED(LOG) #if CONFIG_IS_ENABLED(LOG)
gd->default_log_level = state->default_log_level; gd->default_log_level = state->default_log_level;

2
common/init/board_init.c
View file

@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void)
ulong board_init_f_alloc_reserve(ulong top) ulong board_init_f_alloc_reserve(ulong top)
{ {
/* Reserve early malloc arena */ /* Reserve early malloc arena */
#ifndef CONFIG_MALLOC_F_ADDR #ifndef CFG_MALLOC_F_ADDR
#if CONFIG_VAL(SYS_MALLOC_F_LEN) #if CONFIG_VAL(SYS_MALLOC_F_LEN)
top -= CONFIG_VAL(SYS_MALLOC_F_LEN); top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
#endif #endif

4
common/spl/spl.c
View file

@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)
#if CONFIG_VAL(SYS_MALLOC_F_LEN) #if CONFIG_VAL(SYS_MALLOC_F_LEN)
if (setup_malloc) { if (setup_malloc) {
#ifdef CONFIG_MALLOC_F_ADDR #ifdef CFG_MALLOC_F_ADDR
gd->malloc_base = CONFIG_MALLOC_F_ADDR; gd->malloc_base = CFG_MALLOC_F_ADDR;
#endif #endif
gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN); gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
gd->malloc_ptr = 0; gd->malloc_ptr = 0;

2
doc/arch/sandbox/sandbox.rst
View file

@ -615,7 +615,7 @@ Addr Config Usage
======= ======================== =============================== ======= ======================== ===============================
0 CONFIG_SYS_FDT_LOAD_ADDR Device tree 0 CONFIG_SYS_FDT_LOAD_ADDR Device tree
c000 CONFIG_BLOBLIST_ADDR Blob list 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 f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer
100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used
as the SPL load buffer in spl_test_load(). as the SPL load buffer in spl_test_load().

2
include/configs/capricorn-common.h
View file

@ -14,7 +14,7 @@
/* SPL config */ /* SPL config */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */

2
include/configs/cgtqmx8.h
View file

@ -13,7 +13,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 #define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/imx8mm-cl-iot-gate.h
View file

@ -16,7 +16,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/imx8mm_beacon.h
View file

@ -14,7 +14,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/imx8mm_data_modul_edm_sbc.h
View file

@ -11,7 +11,7 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #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 */ /* For RAW image gives a error info not panic */

2
include/configs/imx8mm_evk.h
View file

@ -24,7 +24,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/imx8mm_icore_mx8mm.h
View file

@ -15,7 +15,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */

2
include/configs/imx8mm_venice.h
View file

@ -14,7 +14,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CONFIG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
#endif #endif
/* Enable Distro Boot */ /* Enable Distro Boot */

2
include/configs/imx8mp_rsb3720.h
View file

@ -24,7 +24,7 @@
0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9) 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
#ifdef CONFIG_SPL_BUILD #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 \ * GD_FLG_FULL_MALLOC_INIT \
* set \ * set \
*/ */

2
include/configs/imx8mq_cm.h
View file

@ -14,7 +14,7 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/imx8mq_evk.h
View file

@ -15,7 +15,7 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

2
include/configs/imx8mq_phanbell.h
View file

@ -14,7 +14,7 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/imx8qm_mek.h
View file

@ -12,7 +12,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 #define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/imx8qxp_mek.h
View file

@ -12,7 +12,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SERIAL_LPUART_BASE 0x5a060000 #define CONFIG_SERIAL_LPUART_BASE 0x5a060000
#define CONFIG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/imx8ulp_evk.h
View file

@ -12,7 +12,7 @@
#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_MALLOC_F_ADDR 0x22040000 #define CFG_MALLOC_F_ADDR 0x22040000
#endif #endif

2
include/configs/imx93_evk.h
View file

@ -14,7 +14,7 @@
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_MALLOC_F_ADDR 0x204D0000 #define CFG_MALLOC_F_ADDR 0x204D0000
#endif #endif
#ifdef CONFIG_DISTRO_DEFAULTS #ifdef CONFIG_DISTRO_DEFAULTS

2
include/configs/kontron-sl-mx8mm.h
View file

@ -46,7 +46,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CONFIG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
#endif #endif
#define CFG_EXTRA_ENV_SETTINGS BOOTENV #define CFG_EXTRA_ENV_SETTINGS BOOTENV

2
include/configs/kontron_pitx_imx8m.h
View file

@ -16,7 +16,7 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */

2
include/configs/kontron_sl28.h
View file

@ -28,7 +28,7 @@
/* generic timer */ /* generic timer */
/* early heap for SPL DM */ /* 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 */ /* serial port */
#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2) #define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)

2
include/configs/phycore_imx8mm.h
View file

@ -16,7 +16,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/pico-imx8mq.h
View file

@ -14,7 +14,7 @@
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/sandbox.h
View file

@ -6,7 +6,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_MALLOC_F_ADDR 0x0010000 #define CFG_MALLOC_F_ADDR 0x0010000
/* Size of our emulated memory */ /* Size of our emulated memory */
#define SB_CONCAT(x, y) x ## y #define SB_CONCAT(x, y) x ## y

2
include/configs/verdin-imx8mm.h
View file

@ -14,7 +14,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif #endif

2
include/configs/verdin-imx8mp.h
View file

@ -16,7 +16,7 @@
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* 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 */ /* For RAW image gives a error info not panic */
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */