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

[u-boot] / lib_mips / board.c

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 9c997f1908f4a9177e41c5a76ed6d59136b92baa..5133b8a5dc43f4a0bfae9e6905627c24402795dc 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -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 */