minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: Add onenand_init() to board.c and move nand_init()

Browse Source 
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:
Stefan Roese 2008-11-12 13:18:19 +01:00 committed by Shinya Kuribayashi
parent 2145188bea
commit 9d23fc584c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib_mips/board.c
View File

@ -30,6 +30,7 @@
#include <net.h> #include <net.h>
#include <environment.h> #include <environment.h>
#include <nand.h> #include <nand.h>
#include <onenand_uboot.h>
#include <spi.h> #include <spi.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -378,6 +379,15 @@ void board_init_r (gd_t *id, ulong dest_addr)
mem_malloc_init(); mem_malloc_init();
malloc_bin_reloc(); 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. */ /* relocate environment function pointers etc. */
env_relocate(); env_relocate();
@ -419,11 +429,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
} }
#endif #endif
#ifdef CONFIG_CMD_NAND
puts ("NAND: ");
nand_init (); /* go init the NAND */
#endif
#ifdef CONFIG_CMD_SPI #ifdef CONFIG_CMD_SPI
puts ("SPI: "); puts ("SPI: ");
spi_init (); /* go init the SPI */ spi_init (); /* go init the SPI */