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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 9b0276cbdb5870d63b2a516f5f929f3a68d78b71..d676a0312af947a1e07e8443f416bfcaab3fc94f 100644 (file)
--- 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 f8fc87f1e46ee6da3aca52e309d1c68b2675fa00..937fb12516c1dce5a6167d5268dd0a5fe8449dee 100644 (file)
--- 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
  *