summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-08-14 12:25:23 -0700
committerTom Rini <trini@ti.com>2012-09-27 09:49:58 -0700
commitd4c4e0e11710f26904c288ad1bf05d8b73abddf7 (patch)
tree46a57a884bc9dad4cd3e98e45c61e774a443912f
parent026b2fe32c3d5658befb54521dcfed46444e6bf8 (diff)
downloadu-boot-imx-d4c4e0e11710f26904c288ad1bf05d8b73abddf7.zip
u-boot-imx-d4c4e0e11710f26904c288ad1bf05d8b73abddf7.tar.gz
u-boot-imx-d4c4e0e11710f26904c288ad1bf05d8b73abddf7.tar.bz2
ARM: SPL: Start hooking in the current SPI SPL support
Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--arch/arm/cpu/armv7/omap-common/spl.c5
-rw-r--r--arch/arm/include/asm/spl.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 3a1029f..dc26750 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -175,6 +175,11 @@ void board_init_r(gd_t *id, ulong dummy)
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");
debug("Found: %d\n", boot_device);
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index fdb78b5..47ca1b6 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