From 39782727e185860faa4884c2b04e84cb33d1c6cf Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Oct 2008 03:55:25 -0400 Subject: Blackfin: init NAND before relocating env If booting out of NAND, we need to make sure we initialize it properly before attempting to relocate the environment. Signed-off-by: Mike Frysinger --- lib_blackfin/board.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib_blackfin') diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 2679b438f..e184fd2f2 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -380,6 +380,11 @@ void board_init_r(gd_t * id, ulong dest_addr) spi_init_r(); #endif +#ifdef CONFIG_CMD_NAND + puts("NAND: "); + nand_init(); /* go init the NAND */ +#endif + /* relocate environment function pointers etc. */ env_relocate(); @@ -427,11 +432,6 @@ void board_init_r(gd_t * id, ulong dest_addr) copy_filename(BootFile, s, sizeof(BootFile)); #endif -#ifdef CONFIG_CMD_NAND - puts("NAND: "); - nand_init(); /* go init the NAND */ -#endif - #if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ misc_init_r(); -- cgit v1.2.3