diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2014-10-09 14:19:13 +0200 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2014-11-20 08:20:10 +0100 |
| commit | 074ba9b23d8a550fa8d8f23d673e4b6984de10ba (patch) | |
| tree | 287de2e68e8ee01e67e52011ce1d694afd34b885 /core/arch/arm32/tee | |
| parent | 50814cf61d84595974771832c41618c5c7cd3131 (diff) | |
Move bget to libutils replacing dlmalloc
* Moves bget to libutils replacing dlmalloc as kernel memory allocator
* Restores the code formatting of bget.{c,h} to the original state as
parts of the current code was unreadable
* Adds malloc_add_pool() to make use of previously unused memory
* Moves call to malloc_init() into platform specific code
* Restores MDBG into working condition
* Adds memalign function to bget.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU virt platform)
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (FVP)
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Diffstat (limited to 'core/arch/arm32/tee')
| -rw-r--r-- | core/arch/arm32/tee/init.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/core/arch/arm32/tee/init.c b/core/arch/arm32/tee/init.c index 38b5460..2b9dfe0 100644 --- a/core/arch/arm32/tee/init.c +++ b/core/arch/arm32/tee/init.c @@ -47,7 +47,6 @@ TEE_Result init_teecore(void) { static int is_first = 1; - unsigned long a, s; /* (DEBUG) for inits at 1st TEE service: when UART is setup */ if (!is_first) @@ -60,20 +59,6 @@ TEE_Result init_teecore(void) IMSG("teecore: uart trace init"); #endif - /* core malloc pool init */ -#ifdef CFG_TEE_MALLOC_START - a = CFG_TEE_MALLOC_START; - s = CFG_TEE_MALLOC_SIZE; -#else - a = (unsigned long)&teecore_heap_start; - s = (unsigned long)&teecore_heap_end; - a = ((a + 1) & ~0x0FFFF) + 0x10000; /* 64kB aligned */ - s = s & ~0x0FFFF; /* 64kB aligned */ - s = s - a; -#endif - IMSG("teecore heap: paddr=0x%lX size=0x%lX (%ldkB)", a, s, s / 1024); - malloc_init((void *)a, s); - /* init support for futur mapping of TAs */ tee_mmu_kmap_init(); teecore_init_ta_ram(); |