From: Tom Rini <trini@ti.com>
Date: Tue, 14 Aug 2012 19:25:23 +0000 (-0700)
Subject: ARM: SPL: Start hooking in the current SPI SPL support
X-Git-Tag: v2012.10-rc2~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4c4e0e11710f26904c288ad1bf05d8b73abddf7;p=oweals%2Fu-boot.git

ARM: SPL: Start hooking in the current SPI SPL support

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 3a1029fa67..dc26750218 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -174,6 +174,11 @@ void board_init_r(gd_t *id, ulong dummy)
 	case BOOT_DEVICE_UART:
 		spl_ymodem_load_image();
 		break;
+#endif
+#ifdef CONFIG_SPL_SPI_SUPPORT
+	case BOOT_DEVICE_SPI:
+		spi_boot();
+	break;
 #endif
 	default:
 		puts("SPL: Un-supported Boot Device\n");
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index fdb78b51e4..47ca1b6678 100644
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -60,6 +60,9 @@ void spl_mmc_load_image(void);
 /* YMODEM SPL functions */
 void spl_ymodem_load_image(void);
 
+/* SPI SPL functions */
+void spi_boot(void);
+
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void);
 #endif