|
@@ -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 */
|