Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / common / malloc_simple.c

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index afdacff..64ae036 100644 (file)
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -19,7 +19,7 @@ void *malloc_simple(size_t bytes)
 
        new_ptr = gd->malloc_ptr + bytes;
        if (new_ptr > gd->malloc_limit)
-               panic("Out of pre-reloc memory");
+               return NULL;
        ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
        return ptr;