diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-10-06 03:55:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-10-23 05:03:50 -0400 |
| commit | 39782727e185860faa4884c2b04e84cb33d1c6cf (patch) | |
| tree | 1a27fddcb02656bcbd50b31cc3ce3024fc34321e /lib_blackfin | |
| parent | 0f9a8819416ba40a53de50af148847a0e508f84d (diff) | |
| download | u-boot-imx-39782727e185860faa4884c2b04e84cb33d1c6cf.zip u-boot-imx-39782727e185860faa4884c2b04e84cb33d1c6cf.tar.gz u-boot-imx-39782727e185860faa4884c2b04e84cb33d1c6cf.tar.bz2 | |
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>
Diffstat (limited to 'lib_blackfin')
| -rw-r--r-- | lib_blackfin/board.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 2679b43..e184fd2 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(); |