diff options
| author | Tom Rini <trini@ti.com> | 2012-08-13 14:13:07 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-27 09:48:39 -0700 |
| commit | 24dafad5c42018ea11c0d12f747a7eb337229f5a (patch) | |
| tree | 609e202d45f149c73d95211e03e29d4f13c81211 /arch/arm/cpu/armv7 | |
| parent | 8082fda9fc6d6fb6ba1bc467fb117af3dbed928a (diff) | |
| download | u-boot-24dafad5c42018ea11c0d12f747a7eb337229f5a.tar.gz u-boot-24dafad5c42018ea11c0d12f747a7eb337229f5a.tar.xz u-boot-24dafad5c42018ea11c0d12f747a7eb337229f5a.zip | |
ARM: SPL: Only call mem_malloc_init if configured
We can only attempt to setup a malloc pool if
CONFIG_SYS_SPL_MALLOC_START is defined, and not all boards require it.
Make the call depend on the define.
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index 4d33f998c6..71a467e52f 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -149,8 +149,10 @@ void board_init_r(gd_t *id, ulong dummy) u32 boot_device; debug(">>spl:board_init_r()\n"); +#ifdef CONFIG_SYS_SPL_MALLOC_START mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START, CONFIG_SYS_SPL_MALLOC_SIZE); +#endif #ifdef CONFIG_SPL_BOARD_INIT spl_board_init(); |