[U-Boot] [PATCH] ARM: socfpga: Clean up Kconfig entries

[Marek Vasut]

Shuffle the default Kconfig entries around so it is not such a mess.
No functional change.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Chin Liang See <chin.liang.see at intel.com>
Cc: Dinh Nguyen <dinguyen at kernel.org>
---
 arch/arm/Kconfig              | 20 +++++++++++++++-----
 arch/arm/mach-socfpga/Kconfig | 30 ------------------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c9d6e0a424..532aa41a87 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -733,14 +733,24 @@ config ARCH_SNAPDRAGON
 
 config ARCH_SOCFPGA
 	bool "Altera SOCFPGA family"
+	select ARCH_EARLY_INIT_R
+	select ARCH_MISC_INIT
 	select CPU_V7A
-	select SUPPORT_SPL
-	select OF_CONTROL
-	select SPL_OF_CONTROL
 	select DM
 	select ENABLE_ARM_SOC_BOOT0_HOOK
-	select ARCH_EARLY_INIT_R
-	select ARCH_MISC_INIT
+	select OF_CONTROL
+	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_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_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
 	select SYS_THUMB_BUILD
 	imply CMD_MTDPARTS
 	imply CRC32_VERIFY
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index afc38d5da9..824c9fc2ba 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -1,35 +1,5 @@
 if ARCH_SOCFPGA
 
-config SPL_LIBCOMMON_SUPPORT
-	default y
-
-config SPL_LIBDISK_SUPPORT
-	default y
-
-config SPL_LIBGENERIC_SUPPORT
-	default y
-
-config SPL_MMC_SUPPORT
-	default y if DM_MMC
-
-config SPL_NAND_SUPPORT
-	default y if SPL_NAND_DENALI
-
-config SPL_SERIAL_SUPPORT
-	default y
-
-config SPL_SPI_FLASH_SUPPORT
-	default y if SPL_SPI_SUPPORT
-
-config SPL_SPI_SUPPORT
-	default y if DM_SPI
-
-config SPL_WATCHDOG_SUPPORT
-	default y
-
-config SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
-	default y
-
 config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
 	default 0xa2
 
-- 
2.16.2