ns16550: change reg-shift property default to zero

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

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 134e05970672b045aec9cfe74c566f32fb35699a..479a1e47b640e987b84a1f57d983839acf83ec11 100644 (file)
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -19,10 +19,13 @@ 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,
+             gd->malloc_limit);
        if (new_ptr > gd->malloc_limit)
                return NULL;
        ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+
        return ptr;
 }
 
@@ -32,15 +35,16 @@ void *memalign_simple(size_t align, size_t bytes)
        void *ptr;
 
        addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
-       new_ptr = addr + bytes;
+       new_ptr = addr + bytes - gd->malloc_base;
        if (new_ptr > gd->malloc_limit)
                return NULL;
        ptr = map_sysmem(addr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_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;