summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-07-21 07:50:03 +0200
committerMarek Vasut <marex@denx.de>2015-08-08 14:14:08 +0200
commit346d6f5667d3ab6e0a7b550d9789d3365a12478a (patch)
tree85e99361f11d39a1dc171536b14ea7bac3924297 /arch/arm/mach-socfpga
parentd3f34e752dd432eb75e50b2f2ab44d0849b3deef (diff)
downloadu-boot-imx-346d6f5667d3ab6e0a7b550d9789d3365a12478a.zip
u-boot-imx-346d6f5667d3ab6e0a7b550d9789d3365a12478a.tar.gz
u-boot-imx-346d6f5667d3ab6e0a7b550d9789d3365a12478a.tar.bz2
arm: socfpga: spl: Add support for booting from QSPI
Add code and configuration options to support booting from QSPI NOR. Enable support for booting from QSPI NOR. Signed-off-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/arm/mach-socfpga')
-rw-r--r--arch/arm/mach-socfpga/spl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c
index bacc845..7f0ebeb 100644
--- a/arch/arm/mach-socfpga/spl.c
+++ b/arch/arm/mach-socfpga/spl.c
@@ -31,7 +31,10 @@ static struct nic301_registers *nic301_regs =
u32 spl_boot_device(void)
{
-#ifdef CONFIG_SPL_MMC_SUPPORT
+#ifdef CONFIG_SPL_SPI_SUPPORT
+ socfpga_per_reset(SOCFPGA_RESET(QSPI), 0);
+ return BOOT_DEVICE_SPI;
+#elif CONFIG_SPL_MMC_SUPPORT
socfpga_per_reset(SOCFPGA_RESET(SDMMC), 0);
socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
return BOOT_DEVICE_MMC1;