V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Marek Vasut 2015-07-21 07:50:03 +02:00
parent d3f34e752d
commit 346d6f5667
5 changed files with 28 additions and 1 deletions

5
arch/arm/mach-socfpga/spl.c
View File

@ -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;

5
configs/socfpga_arria5_defconfig
View File

@ -9,3 +9,8 @@ CONFIG_OF_CONTROL=y
CONFIG_SPI_FLASH=y
CONFIG_SPL_DM=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_DM_SEQ_ALIAS=y
CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPL_SPI_SUPPORT=y

5
configs/socfpga_cyclone5_defconfig
View File

@ -11,3 +11,8 @@ CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_SPL_DM=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_DM_SEQ_ALIAS=y
CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPL_SPI_SUPPORT=y

5
configs/socfpga_socrates_defconfig
View File

@ -11,3 +11,8 @@ CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_SPL_DM=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_DM_SEQ_ALIAS=y
CONFIG_SPL_SIMPLE_BUS=y
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPL_SPI_SUPPORT=y

9
include/configs/socfpga_common.h
View File

@ -301,6 +301,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define CONFIG_SPL_WATCHDOG_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_SPI_SUPPORT
/* SPL SDMMC boot support */
#ifdef CONFIG_SPL_MMC_SUPPORT
@ -315,6 +316,14 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#endif
#endif
/* SPL QSPI boot support */
#ifdef CONFIG_SPL_SPI_SUPPORT
#define CONFIG_DM_SEQ_ALIAS 1
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
#endif
/*
* Stack setup
*/