diff options
| author | Simon Glass <sjg@chromium.org> | 2015-02-27 22:06:36 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-23 09:05:53 -0600 |
| commit | fb5cf7f16be725aec7ab0016268b3b4e26460bee (patch) | |
| tree | 755959683c0f163b7911e57d059fe467f585ab9a | |
| parent | 0879361fd3bc33eb52bcfb2574a78f1e52a36429 (diff) | |
| download | u-boot-imx-fb5cf7f16be725aec7ab0016268b3b4e26460bee.zip u-boot-imx-fb5cf7f16be725aec7ab0016268b3b4e26460bee.tar.gz u-boot-imx-fb5cf7f16be725aec7ab0016268b3b4e26460bee.tar.bz2 | |
Move initf_malloc() to a common place
To allow this function to be used from SPL, move it to the malloc()
code.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/board_f.c | 12 | ||||
| -rw-r--r-- | common/dlmalloc.c | 11 | ||||
| -rw-r--r-- | include/malloc.h | 3 |
3 files changed, 15 insertions, 11 deletions
diff --git a/common/board_f.c b/common/board_f.c index 90f3b88..322e070 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -23,6 +23,7 @@ #include <i2c.h> #include <initcall.h> #include <logbuff.h> +#include <malloc.h> #include <mapmem.h> /* TODO: Can we move these into arch/ headers? */ @@ -721,17 +722,6 @@ static int mark_bootstage(void) return 0; } -static int initf_malloc(void) -{ -#ifdef CONFIG_SYS_MALLOC_F_LEN - assert(gd->malloc_base); /* Set up by crt0.S */ - gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN; - gd->malloc_ptr = 0; -#endif - - return 0; -} - static int initf_dm(void) { #if defined(CONFIG_DM) && defined(CONFIG_SYS_MALLOC_F_LEN) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index b2ce063..b5bb051 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -3261,6 +3261,17 @@ int mALLOPt(param_number, value) int param_number; int value; } } +int initf_malloc(void) +{ +#ifdef CONFIG_SYS_MALLOC_F_LEN + assert(gd->malloc_base); /* Set up by crt0.S */ + gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN; + gd->malloc_ptr = 0; +#endif + + return 0; +} + /* History: diff --git a/include/malloc.h b/include/malloc.h index 5df6348..f4da9e6 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -906,6 +906,9 @@ void *realloc_simple(void *ptr, size_t size); #endif +/* Set up pre-relocation malloc() ready for use */ +int initf_malloc(void); + /* Public routines */ /* Simple versions which can be used when space is tight */ |