[U-Boot-Users] [GIT PULL] MIPS updates

[Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>]

Dear Wolfgang,

please pull MIPS updates. nand_init and spi_init will be added.

---

The following changes since commit 2c8d41969b47eb0b973912830c58689b2ba0e50a:
  Wolfgang Denk (1):
        Merge branch 'master' of git://git.denx.de/u-boot-testing

are available in the git repository at:

  git://git.denx.de/u-boot-mips.git master

Jason McMullan (2):
      [MIPS] lib_mips/board.c: Add nand_init
      mips: If CONFIG_CMD_SPI is defined, call spi_init()

 lib_mips/board.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 1645f2c..532550b 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -28,6 +28,8 @@
 #include <version.h>
 #include <net.h>
 #include <environment.h>
+#include <nand.h>
+#include <spi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -416,6 +418,17 @@ 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 */
+	puts ("ready\n");
+#endif
+
 #if defined(CONFIG_MISC_INIT_R)
 	/* miscellaneous platform dependent initialisations */
 	misc_init_r ();