From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 6 Oct 2008 07:55:25 +0000 (-0400)
Subject: Blackfin: init NAND before relocating env
X-Git-Tag: v2009.01-rc1~102^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=39782727e185860faa4884c2b04e84cb33d1c6cf;p=u-boot

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 <vapier@gentoo.org>
---

diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 2679b438fe..e184fd2f2b 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();