mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
MIPS: Add onenand_init() to board.c and move nand_init()
This patch adds a call to onenand_init() for OneNAND support and moves the nand_init() call to an earlier place, so that the environment can be used from NAND and OneNAND. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
This commit is contained in:
parent
2145188bea
commit
9d23fc584c
1 changed files with 10 additions and 5 deletions
|
@ -30,6 +30,7 @@
|
|||
#include <net.h>
|
||||
#include <environment.h>
|
||||
#include <nand.h>
|
||||
#include <onenand_uboot.h>
|
||||
#include <spi.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -378,6 +379,15 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
mem_malloc_init();
|
||||
malloc_bin_reloc();
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
puts ("NAND: ");
|
||||
nand_init (); /* go init the NAND */
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_ONENAND)
|
||||
onenand_init();
|
||||
#endif
|
||||
|
||||
/* relocate environment function pointers etc. */
|
||||
env_relocate();
|
||||
|
||||
|
@ -419,11 +429,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
puts ("NAND: ");
|
||||
nand_init (); /* go init the NAND */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_SPI
|
||||
puts ("SPI: ");
|
||||
spi_init (); /* go init the SPI */
|
||||
|
|
Loading…
Add table
Reference in a new issue