diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-06-15 12:08:11 +0200 |
| commit | 212b66016120fa4cd3b8f7edbe4c9f106032884e (patch) | |
| tree | f956cd9195952c7890493897a9c2108a8ee852d7 /common/malloc_simple.c | |
| parent | b31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9 (diff) | |
| parent | 64d16706a052553c85d2f8f4c741879a4e3e6116 (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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/common/malloc_simple.c b/common/malloc_simple.c index d445199c58..9811ab60f6 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -26,6 +26,20 @@ void *malloc_simple(size_t bytes) 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, bytes); + new_ptr = addr + bytes; + if (new_ptr > gd->malloc_limit) + return NULL; + ptr = map_sysmem(addr, bytes); + gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr)); + return ptr; +} + #ifdef CONFIG_SYS_MALLOC_SIMPLE void *calloc(size_t nmemb, size_t elem_size) { |