Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh

[people/ms/u-boot.git] / common / malloc_simple.c

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 9811ab60f6d174a35c9b4e68d39321bca4beb8be..611400265ba3efc30db2f1519e72984098d35685 100644 (file)
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -19,10 +19,16 @@ void *malloc_simple(size_t bytes)
        void *ptr;
 
        new_ptr = gd->malloc_ptr + bytes;
-       if (new_ptr > gd->malloc_limit)
+       debug("%s: size=%zx, ptr=%lx, limit=%lx: ", __func__, bytes, 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;
 }
 
@@ -31,16 +37,21 @@ void *memalign_simple(size_t align, size_t bytes)
        ulong addr, new_ptr;
        void *ptr;
 
-       addr = ALIGN(gd->malloc_base + gd->malloc_ptr, bytes);
-       new_ptr = addr + bytes;
-       if (new_ptr > gd->malloc_limit)
+       addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
+       new_ptr = addr + bytes - gd->malloc_base;
+       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;