diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-23 12:35:42 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-23 12:35:42 +0200 |
| commit | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (patch) | |
| tree | 4731dbe1c7371c0c797641d9e755a93e614ec930 /common/malloc_simple.c | |
| parent | 42e550d44bc2335a18065b155cc408f30f0502ef (diff) | |
| parent | 9f13b6d147dc74f2400ce18d9d4005ba53f21fd3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'common/malloc_simple.c')
| -rw-r--r-- | common/malloc_simple.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/malloc_simple.c b/common/malloc_simple.c index c74586376d..479a1e47b6 100644 --- 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; } @@ -37,10 +40,11 @@ void *memalign_simple(size_t align, size_t bytes) 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; |