diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
| commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
| tree | ab93904ec84b33c1e9336baa8eae710dd957683f /configs | |
| parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
| parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/socfpga_arria5_defconfig | 2 | ||||
| -rw-r--r-- | configs/socfpga_cyclone5_defconfig | 2 | ||||
| -rw-r--r-- | configs/socfpga_sr1500_defconfig | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 10eb91d1b2..68d12df404 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_STACK_R=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y +CONFIG_SPL_SIMPLE_BUS=y CONFIG_DWAPB_GPIO=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y @@ -23,3 +24,4 @@ CONFIG_DESIGNWARE_SPI=y CONFIG_DM_MMC=y CONFIG_USB=y CONFIG_DM_USB=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 864358c951..accee924a3 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_STACK_R=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y +CONFIG_SPL_SIMPLE_BUS=y CONFIG_DWAPB_GPIO=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y @@ -23,3 +24,4 @@ CONFIG_DESIGNWARE_SPI=y CONFIG_DM_MMC=y CONFIG_USB=y CONFIG_DM_USB=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 2c75bda084..3d98a636d9 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -17,3 +17,4 @@ CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y CONFIG_DM_MMC=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set |