diff options
| author | Simon Glass | 2023-09-26 08:14:31 -0600 |
|---|---|---|
| committer | Tom Rini | 2023-10-06 14:38:12 -0400 |
| commit | 2003a83cc8b3937cda09e712c75f50f579eed3fa (patch) | |
| tree | 0ee4fca536adb59c2862affa0cc240666cc1cfb1 | |
| parent | 7907a7b99a582f511f93071896c6f8e9163f81d1 (diff) | |
spl: Avoid an #ifdef when printing gd->malloc_ptr
Use an accessor in the header file to avoid this.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/spl/spl.c | 9 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 9b0276cbdb5..d676a0312af 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -860,10 +860,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } else { debug("Unsupported OS image.. Jumping nevertheless..\n"); } -#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 + if (CONFIG_IS_ENABLED(SYS_MALLOC_F) && + !IS_ENABLED(CONFIG_SPL_SYS_MALLOC_SIZE)) + debug("SPL malloc() used 0x%lx bytes (%ld KB)\n", + gd_malloc_ptr(), gd_malloc_ptr() / 1024); + bootstage_mark_name(get_bootstage_id(false), "end phase"); #ifdef CONFIG_BOOTSTAGE_STASH ret = bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR, diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index f8fc87f1e46..937fb12516c 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -588,6 +588,12 @@ static_assert(sizeof(struct global_data) == GD_SIZE); #define gd_set_pci_ram_top(val) #endif +#if CONFIG_VAL(SYS_MALLOC_F_LEN) +#define gd_malloc_ptr() gd->malloc_ptr +#else +#define gd_malloc_ptr() 0L +#endif + /** * enum gd_flags - global data flags * |