SPL: Move SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to Kconfig

[oweals/u-boot.git] / common / malloc_simple.c

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index dd1119f8cfbbde83b404c1a13a8577ca79f35000..611400265ba3efc30db2f1519e72984098d35685 100644 (file)
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -19,12 +19,15 @@ void *malloc_simple(size_t bytes)
        void *ptr;
 
        new_ptr = gd->malloc_ptr + bytes;
-       debug("%s: size=%zx, ptr=%lx, limit=%lx\n", __func__, bytes, new_ptr,
+       debug("%s: size=%zx, ptr=%lx, limit=%lx: ", __func__, bytes, new_ptr,
              gd->malloc_limit);
-       if (new_ptr > gd->malloc_limit)
+       if (new_ptr > gd->malloc_limit) {
+               debug("space exhausted\n");
                return NULL;
+       }
        ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+       debug("%lx\n", (ulong)ptr);
 
        return ptr;
 }
@@ -36,15 +39,19 @@ void *memalign_simple(size_t align, size_t bytes)
 
        addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
        new_ptr = addr + bytes - gd->malloc_base;
-       if (new_ptr > gd->malloc_limit)
+       if (new_ptr > gd->malloc_limit) {
+               debug("space exhausted\n");
                return NULL;
+       }
+
        ptr = map_sysmem(addr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+       debug("%lx\n", (ulong)ptr);
 
        return ptr;
 }
 
-#ifdef CONFIG_SYS_MALLOC_SIMPLE
+#if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
 void *calloc(size_t nmemb, size_t elem_size)
 {
        size_t size = nmemb * elem_size;