From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 18 Jun 2018 18:56:24 +0000 (+0300)
Subject: mvebu: consolidate SPL boot device config symbols
X-Git-Tag: v2018.09-rc2~66^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ad105f5f869443c6b37617ea55091511a2be1579;p=oweals%2Fu-boot.git

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

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
diff --git a/board/gdsys/a38x/Kconfig b/board/gdsys/a38x/Kconfig
deleted file mode 100644
index ff11eb2371..0000000000
--- a/board/gdsys/a38x/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-if TARGET_CONTROLCENTERDC
-
-menu "Controlcenter DC board options"
-
-choice
-	prompt "Select boot method"
-
-config SPL_BOOT_DEVICE_SPI
-	bool "SPI"
-
-config SPL_BOOT_DEVICE_MMC
-	bool "MMC"
-	select SPL_LIBDISK_SUPPORT
-
-endchoice
-
-#config SPL_BOOT_DEVICE
-#	int
-#	default 1 if SPL_BOOT_DEVICE_SPI
-#	default 2 if SPL_BOOT_DEVICE_MMC
-
-endmenu
-
-endif
diff --git a/board/gdsys/a38x/Makefile b/board/gdsys/a38x/Makefile
index 43fec2edbb..18ecbe5e79 100644
--- a/board/gdsys/a38x/Makefile
+++ b/board/gdsys/a38x/Makefile
@@ -13,10 +13,10 @@ obj-$(CONFIG_TARGET_CONTROLCENTERDC) += hydra.o ihs_phys.o
 extra-$(CONFIG_TARGET_CONTROLCENTERDC) += kwbimage.cfg
 
 KWB_REPLACE += BOOT_FROM
-ifneq ($(CONFIG_SPL_BOOT_DEVICE_SPI),)
+ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI),)
 	KWB_CFG_BOOT_FROM=spi
 endif
-ifneq ($(CONFIG_SPL_BOOT_DEVICE_MMC),)
+ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
 	KWB_CFG_BOOT_FROM=sdio
 endif
 
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 9d4d0dfbb2..44d5016fbf 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -93,13 +93,13 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 
-#ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
 /* SPL related SPI defines */
 # define CONFIG_SYS_SPI_U_BOOT_OFFS	0x24000
 # define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
 #endif
 
-#ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_MMC
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
 /* SPL related MMC defines */
 # define CONFIG_SYS_MMC_U_BOOT_OFFS		(160 << 10)
 # define CONFIG_SYS_U_BOOT_OFFS			CONFIG_SYS_MMC_U_BOOT_OFFS