X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fmalloc_simple.c;h=c14f8b59c178ee251cc79299f9fcccfbcb1e340a;hb=de76610545f4350f8e3eac7c0c4ff6349106a9bf;hp=afdacff80d8e1fc411cba7eab59286ef28a8a1e5;hpb=1739564e753bc3a8097f8937a3cbe738bdaaed5d;p=platform%2Fkernel%2Fu-boot.git

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index afdacff..c14f8b5 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Simple malloc implementation
  *
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <malloc.h>
+#include <mapmem.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -18,14 +18,39 @@ void *malloc_simple(size_t bytes)
 	void *ptr;
 
 	new_ptr = gd->malloc_ptr + bytes;
-	if (new_ptr > gd->malloc_limit)
-		panic("Out of pre-reloc memory");
+	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;
+}
+
+void *memalign_simple(size_t align, size_t bytes)
+{
+	ulong addr, new_ptr;
+	void *ptr;
+
+	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;