diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
commit | f46c25583a73042edf432b209ee4b93bc3f7e762 (patch) | |
tree | a7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9 /arch/arm/Kconfig | |
parent | db18f548cb7b5ff99223b66eac1966eb45230817 (diff) | |
parent | f822d8578ba395d9af1cc315a2fb87b1eed3d355 (diff) | |
download | u-boot-imx-f46c25583a73042edf432b209ee4b93bc3f7e762.zip u-boot-imx-f46c25583a73042edf432b209ee4b93bc3f7e762.tar.gz u-boot-imx-f46c25583a73042edf432b209ee4b93bc3f7e762.tar.bz2 |
Merge git://www.denx.de/git/u-boot-marvell
Conflicts:
arch/arm/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 52b300d..dd9cac9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -117,8 +117,14 @@ config ARCH_MVEBU select OF_CONTROL select OF_SEPARATE select DM + select DM_ETH select DM_SERIAL + select DM_SPI + select DM_SPI_FLASH + select SPL_DM select SPL_DM_SEQ_ALIAS + select SPL_OF_CONTROL + select SPL_SIMPLE_BUS config TARGET_DEVKIT3250 bool "Support devkit3250" @@ -770,8 +776,6 @@ source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/db-88f6820-gp/Kconfig" -source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" @@ -810,7 +814,6 @@ source "board/h2200/Kconfig" source "board/hisilicon/hikey/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" -source "board/maxbcm/Kconfig" source "board/mpl/vcma9/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig" |