X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=common%2Fmalloc_simple.c;h=c14f8b59c178ee251cc79299f9fcccfbcb1e340a;hb=51dce7d2bfdecd974412634e4a0758ac55edcc00;hp=9811ab60f6d174a35c9b4e68d39321bca4beb8be;hpb=b6bfb6ff9a2173d5e0e5506b95631aa49396c468;p=u-boot

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 9811ab60f6..c14f8b59c1 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Simple malloc implementation
  *
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -19,10 +18,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 +36,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;