summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-06-18 21:56:24 +0300
committerStefan Roese <sr@denx.de>2018-08-06 14:07:23 +0200
commitad105f5f869443c6b37617ea55091511a2be1579 (patch)
tree644e53a1549fcc2eefa1312bafa201ac9588bf77 /arch
parentd38f04f7c2bca1d636ef67acf605c99e0b3a30cb (diff)
downloadu-boot-ad105f5f869443c6b37617ea55091511a2be1579.tar.gz
u-boot-ad105f5f869443c6b37617ea55091511a2be1579.tar.xz
u-boot-ad105f5f869443c6b37617ea55091511a2be1579.zip
mvebu: consolidate SPL boot device config symbols
Use MVEBU_SPL_BOOT_DEVICE_* to select between SPI and MMC, instead of board specific symbols. This commit enables the boot device selection menu to all mvebu platforms, but it is only effective on Turris Omnia and gdsys Controlcenter DC platforms. A following commit will enable boot selection for other platforms. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-mvebu/Kconfig11
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a047552ed3..63ec02403a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1480,7 +1480,6 @@ source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx35pdk/Kconfig"
source "board/freescale/s32v234evb/Kconfig"
-source "board/gdsys/a38x/Kconfig"
source "board/grinn/chiliboard/Kconfig"
source "board/gumstix/pepper/Kconfig"
source "board/h2200/Kconfig"
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index e340a9b50e..e1b70c54fc 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -183,21 +183,18 @@ config SYS_VENDOR
config SYS_SOC
default "mvebu"
-if TARGET_TURRIS_OMNIA
-
choice
- prompt "Turris Omnia boot method"
+ prompt "Boot method"
-config TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI
+config MVEBU_SPL_BOOT_DEVICE_SPI
bool "SPI NOR flash"
-config TURRIS_OMNIA_SPL_BOOT_DEVICE_MMC
+config MVEBU_SPL_BOOT_DEVICE_MMC
bool "SDIO/MMC card"
+ select SPL_LIBDISK_SUPPORT
endchoice
-endif
-
config MVEBU_EFUSE
bool "Enable eFuse support"
default n