summaryrefslogtreecommitdiffstats
path: root/lib_arm
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2009-05-11 15:50:12 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:47 +0200
commitc790b04d230363d03939dc008bcc80f3ba4de1ae (patch)
treec3e0873b01e2f6f38648177f31358c623825f01d /lib_arm
parentd873133f2ba9bd613d5f6552c31cc70fb13f15d3 (diff)
downloadblackbird-obmc-uboot-c790b04d230363d03939dc008bcc80f3ba4de1ae.tar.gz
blackbird-obmc-uboot-c790b04d230363d03939dc008bcc80f3ba4de1ae.zip
lib_arch/board.c: Move malloc initialization before flash_init()
This patch moves the malloc initialization before calling flash_init(). Upcoming changes to the NOR FLASH common CFI driver with optional MTD infrastructure and MTD concatenation support will call malloc(). And nothing really speaks against enabling malloc just a little earlier in the boot stage. Some architectures already enable malloc before calling flash_init() so they don't need any changes here. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Scott McNutt <smcnutt@psyent.com> Cc: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Daniel Hellstrom <daniel@gaisler.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: John Rigby <jcrigby@gmail.com>
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 5d05d9b927..e3040acdc6 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -316,6 +316,9 @@ void start_armboot (void)
}
}
+ /* armboot_start is defined in the board-specific linker script */
+ mem_malloc_init (_armboot_start - CONFIG_SYS_MALLOC_LEN);
+
#ifndef CONFIG_SYS_NO_FLASH
/* configure available FLASH banks */
display_flash_config (flash_init ());
@@ -350,9 +353,6 @@ void start_armboot (void)
}
#endif /* CONFIG_LCD */
- /* armboot_start is defined in the board-specific linker script */
- mem_malloc_init (_armboot_start - CONFIG_SYS_MALLOC_LEN);
-
#if defined(CONFIG_CMD_NAND)
puts ("NAND: ");
nand_init(); /* go init the NAND */
OpenPOWER on IntegriCloud