Merge branch 'master' of git://git.denx.de/u-boot-socfpga
This commit is contained in:
commit
e7463b37a1
@ -817,15 +817,11 @@ config ARCH_SOCFPGA
|
||||
select SPL_DM_RESET if DM_RESET
|
||||
select SPL_DM_SERIAL
|
||||
select SPL_LIBCOMMON_SUPPORT
|
||||
select SPL_LIBDISK_SUPPORT
|
||||
select SPL_LIBGENERIC_SUPPORT
|
||||
select SPL_MMC_SUPPORT if DM_MMC
|
||||
select SPL_NAND_SUPPORT if SPL_NAND_DENALI
|
||||
select SPL_OF_CONTROL
|
||||
select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
|
||||
select SPL_SERIAL_SUPPORT
|
||||
select SPL_SPI_FLASH_SUPPORT if SPL_SPI_SUPPORT
|
||||
select SPL_SPI_SUPPORT if DM_SPI
|
||||
select SPL_WATCHDOG_SUPPORT
|
||||
select SUPPORT_SPL
|
||||
select SYS_NS16550
|
||||
@ -836,8 +832,12 @@ config ARCH_SOCFPGA
|
||||
imply DM_SPI
|
||||
imply DM_SPI_FLASH
|
||||
imply FAT_WRITE
|
||||
imply SPL_LIBDISK_SUPPORT
|
||||
imply SPL_MMC_SUPPORT
|
||||
imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
|
||||
imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
|
||||
imply SPL_SPI_FLASH_SUPPORT
|
||||
imply SPL_SPI_SUPPORT
|
||||
|
||||
config ARCH_SUNXI
|
||||
bool "Support sunxi (Allwinner) SoCs"
|
||||
|
Loading…
Reference in New Issue
Block a user