diff options
| author | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
| commit | 757566d1567a98f5c331c14f088001dbfe187191 (patch) | |
| tree | 86c9ab53fbefee672f37165f51db398338bf9968 /common/malloc_simple.c | |
| parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
| parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/malloc_simple.c')
| -rw-r--r-- | common/malloc_simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/malloc_simple.c b/common/malloc_simple.c index afdacff80d8..64ae0365afc 100644 --- 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; |