diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-07-07 11:38:44 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-07-07 11:38:44 +0200 |
| commit | 6f43ba70d15e15a08c25b3d956c70addb6740737 (patch) | |
| tree | e5ddc8498043c0c47559737ea60e4d7fc866e20a /common/malloc_simple.c | |
| parent | 003b09dad492ebc385b28067b8028a0c0ff9323f (diff) | |
| parent | 9c6b05cb724e18d1db3f9e1a75b2272572f06fbd (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
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 d445199c58a..9811ab60f6d 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) { |