mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 17:10:11 +00:00
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>
This commit is contained in:
parent
0f9a881941
commit
39782727e1
1 changed files with 5 additions and 5 deletions
|
@ -380,6 +380,11 @@ void board_init_r(gd_t * id, ulong dest_addr)
|
||||||
spi_init_r();
|
spi_init_r();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_CMD_NAND
|
||||||
|
puts("NAND: ");
|
||||||
|
nand_init(); /* go init the NAND */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* relocate environment function pointers etc. */
|
/* relocate environment function pointers etc. */
|
||||||
env_relocate();
|
env_relocate();
|
||||||
|
|
||||||
|
@ -427,11 +432,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
|
||||||
copy_filename(BootFile, s, sizeof(BootFile));
|
copy_filename(BootFile, s, sizeof(BootFile));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_CMD_NAND
|
|
||||||
puts("NAND: ");
|
|
||||||
nand_init(); /* go init the NAND */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_MISC_INIT_R)
|
#if defined(CONFIG_MISC_INIT_R)
|
||||||
/* miscellaneous platform dependent initialisations */
|
/* miscellaneous platform dependent initialisations */
|
||||||
misc_init_r();
|
misc_init_r();
|
||||||
|
|
Loading…
Reference in a new issue