summaryrefslogtreecommitdiff
path: root/lib_sh
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_sh
parentd873133f2ba9bd613d5f6552c31cc70fb13f15d3 (diff)
downloadu-boot-imx-c790b04d230363d03939dc008bcc80f3ba4de1ae.zip
u-boot-imx-c790b04d230363d03939dc008bcc80f3ba4de1ae.tar.gz
u-boot-imx-c790b04d230363d03939dc008bcc80f3ba4de1ae.tar.bz2
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_sh')
-rw-r--r--lib_sh/board.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_sh/board.c b/lib_sh/board.c
index 2fd213b..183110f 100644
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -146,8 +146,8 @@ init_fnc_t *init_sequence[] =
checkboard, /* Check support board */
dram_init, /* SDRAM init */
timer_init, /* SuperH Timer (TCNT0 only) init */
- sh_flash_init, /* Flash memory(NOR) init*/
sh_mem_env_init,
+ sh_flash_init, /* Flash memory(NOR) init*/
INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
INIT_FUNC_PCI_INIT /* PCI init */
devices_init,