diff options
| author | Simon Glass <sjg@chromium.org> | 2023-09-26 08:14:27 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 14:38:12 -0400 |
| commit | 3d6d50751469fbadec3e34fbb6d06f21746619dd (patch) | |
| tree | 9dee21255e4963c896bb6c3a2edbd7cef8ca2a47 /common/spl | |
| parent | a57204180799489bacfdad3f6b32dc520ed545df (diff) | |
| download | u-boot-3d6d50751469fbadec3e34fbb6d06f21746619dd.zip u-boot-3d6d50751469fbadec3e34fbb6d06f21746619dd.tar.gz u-boot-3d6d50751469fbadec3e34fbb6d06f21746619dd.tar.bz2 | |
spl: Use SYS_MALLOC_F instead of SYS_MALLOC_F_LEN
Use the new SPL/TPL/VPL_SYS_MALLOC_F symbols to determine whether the
malloc pool exists.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Sean Anderson <sean.anderson@seco.com>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 898ddfe..9b0276c 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -523,7 +523,7 @@ static int spl_common_init(bool setup_malloc) { int ret; -#if CONFIG_VAL(SYS_MALLOC_F_LEN) +#if CONFIG_IS_ENABLED(SYS_MALLOC_F) if (setup_malloc) { #ifdef CFG_MALLOC_F_ADDR gd->malloc_base = CFG_MALLOC_F_ADDR; @@ -860,7 +860,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } else { debug("Unsupported OS image.. Jumping nevertheless..\n"); } -#if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_SYS_MALLOC_SIZE) +#if CONFIG_IS_ENABLED(SYS_MALLOC_F) && !defined(CONFIG_SPL_SYS_MALLOC_SIZE) debug("SPL malloc() used 0x%lx bytes (%ld KB)\n", gd->malloc_ptr, gd->malloc_ptr / 1024); #endif @@ -961,7 +961,7 @@ ulong spl_relocate_stack_gd(void) if (CONFIG_IS_ENABLED(SYS_REPORT_STACK_F_USAGE)) spl_relocate_stack_check(); -#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN) +#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_IS_ENABLED(SYS_MALLOC_F) if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) { debug("SPL malloc() before relocation used 0x%lx bytes (%ld KB)\n", gd->malloc_ptr, gd->malloc_ptr / 1024); |