Kconfig: Sort bool, default, select and imply options

Fix Kconfig bool, default, select and imply options to be
alphabetically sorted.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

14 files changed, 334 insertions, 334 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index cbeb9f6734..7967fa50ac 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -10,12 +10,12 @@ choice
 
 config ARC
 	bool "ARC architecture"
-	select HAVE_PRIVATE_LIBGCC
-	select SUPPORT_OF_CONTROL
 	select ARCH_EARLY_INIT_R
+	select ARC_TIMER
 	select CLK
+	select HAVE_PRIVATE_LIBGCC
+	select SUPPORT_OF_CONTROL
 	select TIMER
-	select ARC_TIMER
 
 config ARM
 	bool "ARM architecture"
@@ -46,10 +46,10 @@ config NDS32
 
 config NIOS2
 	bool "Nios II architecture"
-	select SUPPORT_OF_CONTROL
-	select OF_CONTROL
-	select DM
 	select CPU
+	select DM
+	select OF_CONTROL
+	select SUPPORT_OF_CONTROL
 
 config PPC
 	bool "PowerPC architecture"
@@ -65,30 +65,30 @@ config RISCV
 config SANDBOX
 	bool "Sandbox"
 	select BOARD_LATE_INIT
-	select SUPPORT_OF_CONTROL
 	select DM
+	select DM_GPIO
+	select DM_I2C
 	select DM_KEYBOARD
-	select DM_SPI_FLASH
+	select DM_MMC
 	select DM_SERIAL
-	select DM_I2C
 	select DM_SPI
-	select DM_GPIO
-	select DM_MMC
+	select DM_SPI_FLASH
 	select HAVE_BLOCK_DEVICE
-	select SPI
 	select LZO
+	select SPI
+	select SUPPORT_OF_CONTROL
 	imply CMD_GETTIME
 	imply CMD_HASH
 	imply CMD_IO
 	imply CMD_IOTRACE
 	imply CMD_LZMADEC
+	imply CMD_SATA
+	imply CMD_SF_TEST
 	imply CRC32_VERIFY
 	imply FAT_WRITE
 	imply HASH_VERIFY
 	imply LZMA
 	imply SCSI
-	imply CMD_SATA
-	imply CMD_SF_TEST
 
 config SH
 	bool "SuperH architecture"
@@ -97,39 +97,39 @@ config SH
 config X86
 	bool "x86 architecture"
 	select CREATE_ARCH_SYMLINK
-	select HAVE_PRIVATE_LIBGCC
-	select USE_PRIVATE_LIBGCC
-	select SUPPORT_OF_CONTROL
-	select OF_CONTROL
 	select DM
 	select DM_PCI
+	select HAVE_PRIVATE_LIBGCC
+	select OF_CONTROL
 	select PCI
+	select SUPPORT_OF_CONTROL
 	select TIMER
+	select USE_PRIVATE_LIBGCC
 	select X86_TSC_TIMER
 	imply BLK
+	imply CMD_FPGA_LOADMK
+	imply CMD_GETTIME
+	imply CMD_IO
+	imply CMD_IRQ
+	imply CMD_PCI
+	imply CMD_SF_TEST
+	imply CMD_ZBOOT
 	imply DM_ETH
 	imply DM_GPIO
 	imply DM_KEYBOARD
 	imply DM_MMC
 	imply DM_RTC
-	imply DM_SERIAL
 	imply DM_SCSI
+	imply DM_SERIAL
 	imply DM_SPI
 	imply DM_SPI_FLASH
 	imply DM_USB
 	imply DM_VIDEO
 	imply SYSRESET
 	imply SYSRESET_X86
-	imply CMD_FPGA_LOADMK
-	imply CMD_GETTIME
-	imply CMD_IO
-	imply CMD_IRQ
-	imply CMD_PCI
-	imply CMD_SF_TEST
-	imply CMD_ZBOOT
-	imply USB_HOST_ETHER
 	imply USB_ETHER_ASIX
 	imply USB_ETHER_SMSC95XX
+	imply USB_HOST_ETHER
 
 config XTENSA
 	bool "Xtensa architecture"
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f9d3f79827..b29e8f75d2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -219,25 +219,25 @@ config CPU_ARM1176
 
 config CPU_V7A
 	bool
-	select HAS_VBAR
 	select HAS_THUMB2
+	select HAS_VBAR
 	select SYS_CACHE_SHIFT_6
 	imply SYS_ARM_MMU
 
 config CPU_V7M
 	bool
 	select HAS_THUMB2
-	select THUMB2_KERNEL
-	select SYS_CACHE_SHIFT_5
 	select SYS_ARM_MPU
+	select SYS_CACHE_SHIFT_5
 	select SYS_THUMB_BUILD
+	select THUMB2_KERNEL
 
 config CPU_V7R
 	bool
 	select HAS_THUMB2
-	select SYS_CACHE_SHIFT_6
-	select SYS_ARM_MPU
 	select SYS_ARM_CACHE_CP15
+	select SYS_ARM_MPU
+	select SYS_CACHE_SHIFT_6
 
 config CPU_PXA
 	bool
@@ -427,19 +427,19 @@ config ARCH_DAVINCI
 
 config KIRKWOOD
 	bool "Marvell Kirkwood"
-	select CPU_ARM926EJS
-	select BOARD_EARLY_INIT_F
 	select ARCH_MISC_INIT
+	select BOARD_EARLY_INIT_F
+	select CPU_ARM926EJS
 
 config ARCH_MVEBU
 	bool "Marvell MVEBU family (Armada XP/375/38x/3700/7K/8K)"
-	select OF_CONTROL
-	select OF_SEPARATE
 	select DM
 	select DM_ETH
 	select DM_SERIAL
 	select DM_SPI
 	select DM_SPI_FLASH
+	select OF_CONTROL
+	select OF_SEPARATE
 	select SPI
 
 config TARGET_DEVKIT3250
@@ -463,31 +463,31 @@ config ORION5X
 
 config TARGET_SPEAR300
 	bool "Support spear300"
-	select CPU_ARM926EJS
 	select BOARD_EARLY_INIT_F
-	imply CMD_SAVES
+	select CPU_ARM926EJS
 	select PL011_SERIAL
+	imply CMD_SAVES
 
 config TARGET_SPEAR310
 	bool "Support spear310"
-	select CPU_ARM926EJS
 	select BOARD_EARLY_INIT_F
-	imply CMD_SAVES
+	select CPU_ARM926EJS
 	select PL011_SERIAL
+	imply CMD_SAVES
 
 config TARGET_SPEAR320
 	bool "Support spear320"
-	select CPU_ARM926EJS
 	select BOARD_EARLY_INIT_F
-	imply CMD_SAVES
+	select CPU_ARM926EJS
 	select PL011_SERIAL
+	imply CMD_SAVES
 
 config TARGET_SPEAR600
 	bool "Support spear600"
-	select CPU_ARM926EJS
 	select BOARD_EARLY_INIT_F
-	imply CMD_SAVES
+	select CPU_ARM926EJS
 	select PL011_SERIAL
+	imply CMD_SAVES
 
 config TARGET_STV0991
 	bool "Support stv0991"
@@ -496,16 +496,16 @@ config TARGET_STV0991
 	select DM_SERIAL
 	select DM_SPI
 	select DM_SPI_FLASH
+	select PL01X_SERIAL
 	select SPI
 	select SPI_FLASH
-	select PL01X_SERIAL
 
 config TARGET_X600
 	bool "Support x600"
 	select BOARD_LATE_INIT
 	select CPU_ARM926EJS
-	select SUPPORT_SPL
 	select PL011_SERIAL
+	select SUPPORT_SPL
 
 config TARGET_WOODBURN
 	bool "Support woodburn"
@@ -528,8 +528,8 @@ config TARGET_MX35PDK
 config ARCH_BCM283X
 	bool "Broadcom BCM283X family"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OF_CONTROL
 	select PL01X_SERIAL
 	select SERIAL_SEARCH_ALL
@@ -577,13 +577,13 @@ config TARGET_BCM28155_AP
 config TARGET_BCMCYGNUS
 	bool "Support bcmcygnus"
 	select CPU_V7A
-	imply CRC32_VERIFY
+	imply BCM_SF2_ETH
+	imply BCM_SF2_ETH_GMAC
 	imply CMD_HASH
+	imply CRC32_VERIFY
 	imply FAT_WRITE
 	imply HASH_VERIFY
 	imply NETDEVICES
-	imply BCM_SF2_ETH
-	imply BCM_SF2_ETH_GMAC
 
 config TARGET_BCMNSP
 	bool "Support bcmnsp"
@@ -600,12 +600,12 @@ config TARGET_BCMNS2
 config ARCH_EXYNOS
 	bool "Samsung EXYNOS"
 	select DM
+	select DM_GPIO
 	select DM_I2C
-	select DM_SPI_FLASH
+	select DM_KEYBOARD
 	select DM_SERIAL
 	select DM_SPI
-	select DM_GPIO
-	select DM_KEYBOARD
+	select DM_SPI_FLASH
 	select SPI
 	imply FAT_WRITE
 
@@ -613,9 +613,9 @@ config ARCH_S5PC1XX
 	bool "Samsung S5PC1XX"
 	select CPU_V7A
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
 	select DM_I2C
+	select DM_SERIAL
 
 config ARCH_HIGHBANK
 	bool "Calxeda Highbank"
@@ -630,14 +630,14 @@ config ARCH_INTEGRATOR
 
 config ARCH_KEYSTONE
 	bool "TI Keystone"
+	select CMD_POWEROFF
 	select CPU_V7A
 	select SUPPORT_SPL
-	select SYS_THUMB_BUILD
-	select CMD_POWEROFF
 	select SYS_ARCH_TIMER
+	select SYS_THUMB_BUILD
 	imply CMD_MTDPARTS
-	imply FIT
 	imply CMD_SAVES
+	imply FIT
 
 config ARCH_OMAP2PLUS
 	bool "TI OMAP2+"
@@ -690,12 +690,12 @@ config ARCH_MX7ULP
 
 config ARCH_MX7
 	bool "Freescale MX7"
+	select ARCH_MISC_INIT
+	select BOARD_EARLY_INIT_F
 	select CPU_V7A
 	select SYS_FSL_HAS_SEC if SECURE_BOOT
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
-	select BOARD_EARLY_INIT_F
-	select ARCH_MISC_INIT
 	imply MXC_GPIO
 
 config ARCH_MX6
@@ -714,8 +714,8 @@ endif
 
 config ARCH_MX5
 	bool "Freescale MX5"
-	select CPU_V7A
 	select BOARD_EARLY_INIT_F
+	select CPU_V7A
 	imply MXC_GPIO
 
 config ARCH_OWL
@@ -734,9 +734,9 @@ config ARCH_QEMU
 
 config ARCH_RMOBILE
 	bool "Renesas ARM SoCs"
+	select BOARD_EARLY_INIT_F
 	select DM
 	select DM_SERIAL
-	select BOARD_EARLY_INIT_F
 	imply FAT_WRITE
 	imply SYS_THUMB_BUILD
 
@@ -751,30 +751,32 @@ config ARCH_SNAPDRAGON
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
-	select SPMI
+	select MSM_SMEM
 	select OF_CONTROL
 	select OF_SEPARATE
 	select SMEM
-	select MSM_SMEM
+	select SPMI
 
 config ARCH_SOCFPGA
 	bool "Altera SOCFPGA family"
 	select ARCH_EARLY_INIT_R
 	select ARCH_MISC_INIT
+	select ARM64 if TARGET_SOCFPGA_STRATIX10
 	select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
 	select DM
 	select DM_SERIAL
 	select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
 	select OF_CONTROL
 	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_DM_SERIAL
 	select SPL_SPI_FLASH_SUPPORT if SPL_SPI_SUPPORT
 	select SPL_SPI_SUPPORT if DM_SPI
 	select SPL_WATCHDOG_SUPPORT
@@ -782,14 +784,12 @@ config ARCH_SOCFPGA
 	select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
 	select SYS_NS16550
 	select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
-	select ARM64 if TARGET_SOCFPGA_STRATIX10
 	imply CMD_MTDPARTS
 	imply CRC32_VERIFY
 	imply DM_SPI
 	imply DM_SPI_FLASH
 	imply FAT_WRITE
 	imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
-	select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
 
 config ARCH_SUNXI
 	bool "Support sunxi (Allwinner) SoCs"
@@ -809,12 +809,12 @@ config ARCH_SUNXI
 	select SPECIFY_CONSOLE_INDEX
 	select SPL_STACK_R if SPL
 	select SPL_SYS_MALLOC_SIMPLE if SPL
-	select SYS_NS16550
 	select SPL_SYS_THUMB_BUILD if !ARM64
+	select SYS_NS16550
 	select SYS_THUMB_BUILD if !ARM64
 	select USB if DISTRO_DEFAULTS
-	select USB_STORAGE if DISTRO_DEFAULTS
 	select USB_KEYBOARD if DISTRO_DEFAULTS
+	select USB_STORAGE if DISTRO_DEFAULTS
 	select USE_TINY_PRINTF
 	imply CMD_GPT
 	imply DISTRO_DEFAULTS
@@ -839,51 +839,51 @@ config ARCH_VF610
 
 config ARCH_ZYNQ
 	bool "Xilinx Zynq based platform"
+	select BOARD_EARLY_INIT_F if WDT
 	select BOARD_LATE_INIT
+	select CLK
+	select CLK_ZYNQ
 	select CPU_V7A
-	select SUPPORT_SPL
-	select OF_CONTROL
-	select SPL_BOARD_INIT if SPL
-	select BOARD_EARLY_INIT_F if WDT
-	select SPL_OF_CONTROL if SPL
 	select DM
 	select DM_ETH if NET
-	select SPL_DM if SPL
 	select DM_MMC if MMC
-	select DM_SPI
 	select DM_SERIAL
+	select DM_SPI
 	select DM_SPI_FLASH
-	select SPL_SEPARATE_BSS if SPL
 	select DM_USB if USB
-	select CLK
-	select SPL_CLK if SPL
-	select CLK_ZYNQ
+	select OF_CONTROL
 	select SPI
+	select SPL_BOARD_INIT if SPL
+	select SPL_CLK if SPL
+	select SPL_DM if SPL
+	select SPL_OF_CONTROL if SPL
+	select SPL_SEPARATE_BSS if SPL
+	select SUPPORT_SPL
+	imply ARCH_EARLY_INIT_R
 	imply CMD_CLK
-	imply FAT_WRITE
 	imply CMD_SPL
-	imply ARCH_EARLY_INIT_R
+	imply FAT_WRITE
 
 config ARCH_ZYNQMP_R5
 	bool "Xilinx ZynqMP R5 based platform"
+	select CLK
 	select CPU_V7R
-	select OF_CONTROL
 	select DM
 	select DM_SERIAL
-	select CLK
+	select OF_CONTROL
 
 config ARCH_ZYNQMP
 	bool "Xilinx ZynqMP based platform"
 	select ARM64
 	select BOARD_LATE_INIT
+	select CLK
 	select DM
-	select OF_CONTROL
 	select DM_SERIAL
-	select SUPPORT_SPL
-	select CLK
+	select DM_USB if USB
+	select OF_CONTROL
 	select SPL_BOARD_INIT if SPL
 	select SPL_CLK if SPL
-	select DM_USB if USB
+	select SUPPORT_SPL
 	imply FAT_WRITE
 
 config TEGRA
@@ -899,8 +899,8 @@ config TARGET_VEXPRESS64_AEMV8A
 config TARGET_VEXPRESS64_BASE_FVP
 	bool "Support Versatile Express ARMv8a FVP BASE model"
 	select ARM64
-	select SEMIHOSTING
 	select PL01X_SERIAL
+	select SEMIHOSTING
 
 config TARGET_VEXPRESS64_BASE_FVP_DRAM
 	bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM"
@@ -920,9 +920,9 @@ config TARGET_VEXPRESS64_JUNO
 config TARGET_LS2080A_EMU
 	bool "Support ls2080a_emu"
 	select ARCH_LS2080A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
-	select ARCH_MISC_INIT
 	help
 	  Support for Freescale LS2080A_EMU platform
 	  The LS2080A Development System (EMULATOR) is a pre silicon
@@ -932,9 +932,9 @@ config TARGET_LS2080A_EMU
 config TARGET_LS2080A_SIMU
 	bool "Support ls2080a_simu"
 	select ARCH_LS2080A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
-	select ARCH_MISC_INIT
 	help
 	  Support for Freescale LS2080A_SIMU platform
 	  The LS2080A Development System (QDS) is a pre silicon
@@ -944,9 +944,9 @@ config TARGET_LS2080A_SIMU
 config TARGET_LS1088AQDS
 	bool "Support ls1088aqds"
 	select ARCH_LS1088A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
-	select ARCH_MISC_INIT
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	help
@@ -958,11 +958,11 @@ config TARGET_LS1088AQDS
 config TARGET_LS2080AQDS
 	bool "Support ls2080aqds"
 	select ARCH_LS2080A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
-	select ARCH_MISC_INIT
 	imply SCSI
 	imply SCSI_AHCI
 	help
@@ -974,11 +974,11 @@ config TARGET_LS2080AQDS
 config TARGET_LS2080ARDB
 	bool "Support ls2080ardb"
 	select ARCH_LS2080A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
-	select ARCH_MISC_INIT
 	imply SCSI
 	imply SCSI_AHCI
 	help
@@ -990,11 +990,11 @@ config TARGET_LS2080ARDB
 config TARGET_LS2081ARDB
 	bool "Support ls2081ardb"
 	select ARCH_LS2080A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
-	select ARCH_MISC_INIT
 	help
 	  Support for Freescale LS2081ARDB platform.
 	  The LS2081A Reference design board (RDB) is a high-performance
@@ -1018,9 +1018,9 @@ config TARGET_POPLAR
 	bool "Support Poplar 96boards Enterprise Edition Platform"
 	select ARM64
 	select DM
-	select OF_CONTROL
 	select DM_SERIAL
 	select DM_USB
+	select OF_CONTROL
 	select PL01X_SERIAL
 	  help
 	  Support for Poplar 96boards EE platform. It features a HI3798cv200
@@ -1067,8 +1067,8 @@ config TARGET_LS1012A2G5RDB
 config TARGET_LS1012AFRWY
 	bool "Support ls1012afrwy"
 	select ARCH_LS1012A
-	select BOARD_LATE_INIT
 	select ARM64
+	select BOARD_LATE_INIT
 	imply SCSI
 	imply SCSI_AHCI
 	help
@@ -1090,9 +1090,9 @@ config TARGET_LS1012AFRDM
 config TARGET_LS1088ARDB
 	bool "Support ls1088ardb"
 	select ARCH_LS1088A
+	select ARCH_MISC_INIT
 	select ARM64
 	select ARMV8_MULTIENTRY
-	select ARCH_MISC_INIT
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	help
@@ -1103,40 +1103,40 @@ config TARGET_LS1088ARDB
 
 config TARGET_LS1021AQDS
 	bool "Support ls1021aqds"
+	select ARCH_LS1021A
+	select ARCH_SUPPORT_PSCI
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
-	select SUPPORT_SPL
-	select ARCH_LS1021A
-	select ARCH_SUPPORT_PSCI
 	select LS1_DEEP_SLEEP
+	select SUPPORT_SPL
 	select SYS_FSL_DDR
-	select BOARD_EARLY_INIT_F
 	imply SCSI
 
 config TARGET_LS1021ATWR
 	bool "Support ls1021atwr"
+	select ARCH_LS1021A
+	select ARCH_SUPPORT_PSCI
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
-	select SUPPORT_SPL
-	select ARCH_LS1021A
-	select ARCH_SUPPORT_PSCI
 	select LS1_DEEP_SLEEP
-	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 	imply SCSI
 
 config TARGET_LS1021AIOT
 	bool "Support ls1021aiot"
+	select ARCH_LS1021A
+	select ARCH_SUPPORT_PSCI
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
 	select SUPPORT_SPL
-	select ARCH_LS1021A
-	select ARCH_SUPPORT_PSCI
 	imply SCSI
 	help
 	  Support for Freescale LS1021AIOT platform.
@@ -1149,9 +1149,9 @@ config TARGET_LS1043AQDS
 	select ARCH_LS1043A
 	select ARM64
 	select ARMV8_MULTIENTRY
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 	imply SCSI
 	help
 	  Support for Freescale LS1043AQDS platform.
@@ -1161,9 +1161,9 @@ config TARGET_LS1043ARDB
 	select ARCH_LS1043A
 	select ARM64
 	select ARMV8_MULTIENTRY
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 	imply SCSI
 	help
 	  Support for Freescale LS1043ARDB platform.
@@ -1173,10 +1173,10 @@ config TARGET_LS1046AQDS
 	select ARCH_LS1046A
 	select ARM64
 	select ARMV8_MULTIENTRY
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM_SPI_FLASH if DM_SPI
-	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 	imply SCSI
 	help
 	  Support for Freescale LS1046AQDS platform.
@@ -1189,11 +1189,11 @@ config TARGET_LS1046ARDB
 	select ARCH_LS1046A
 	select ARM64
 	select ARMV8_MULTIENTRY
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM_SPI_FLASH if DM_SPI
 	select POWER_MC34VR500
-	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 	imply SCSI
 	help
 	  Support for Freescale LS1046ARDB platform.
@@ -1249,12 +1249,12 @@ config STM32
 
 config ARCH_STI
 	bool "Support STMicrolectronics SoCs"
+	select BLK
 	select CPU_V7A
 	select DM
-	select DM_SERIAL
-	select BLK
 	select DM_MMC
 	select DM_RESET
+	select DM_SERIAL
 	help
 	  Support for STMicroelectronics STiH407/10 SoC family.
 	  This SoC is used on Linaro 96Board STiH410-B2260
@@ -1268,9 +1268,9 @@ config ARCH_STM32MP
 	select DM_GPIO
 	select DM_RESET
 	select DM_SERIAL
+	select MISC
 	select OF_CONTROL
 	select OF_LIBFDT
-	select MISC
 	select PINCTRL
 	select REGMAP
 	select SUPPORT_SPL
@@ -1285,44 +1285,44 @@ config ARCH_STM32MP
 
 config ARCH_ROCKCHIP
 	bool "Support Rockchip SoCs"
-	select OF_CONTROL
 	select BLK
 	select DM
-	select SPL_DM if SPL
-	select SYS_MALLOC_F
-	select SYS_THUMB_BUILD if !ARM64
-	select SPL_SYS_MALLOC_SIMPLE if SPL
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
+	select DM_PWM
+	select DM_REGULATOR
 	select DM_SERIAL
 	select DM_SPI
 	select DM_SPI_FLASH
 	select DM_USB if USB
-	select DM_PWM
-	select DM_REGULATOR
 	select ENABLE_ARM_SOC_BOOT0_HOOK
+	select OF_CONTROL
 	select SPI
+	select SPL_DM if SPL
+	select SPL_SYS_MALLOC_SIMPLE if SPL
+	select SYS_MALLOC_F
+	select SYS_THUMB_BUILD if !ARM64
+	imply ADC
 	imply DISTRO_DEFAULTS
 	imply FAT_WRITE
-	imply USB_FUNCTION_FASTBOOT
-	imply SPL_SYSRESET
-	imply TPL_SYSRESET
-	imply ADC
 	imply SARADC_ROCKCHIP
+	imply SPL_SYSRESET
 	imply SYS_NS16550
+	imply TPL_SYSRESET
+	imply USB_FUNCTION_FASTBOOT
 
 config TARGET_THUNDERX_88XX
 	bool "Support ThunderX 88xx"
 	select ARM64
 	select OF_CONTROL
-	select SYS_CACHE_SHIFT_7
 	select PL01X_SERIAL
+	select SYS_CACHE_SHIFT_7
 
 config ARCH_ASPEED
 	bool "Support Aspeed SoCs"
-	select OF_CONTROL
 	select DM
+	select OF_CONTROL
 
 endchoice
 
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index ce6be3829a..1a56957cf9 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -76,18 +76,18 @@ config TARGET_SNAPPER9260
 	bool "Support snapper9260"
 	select AT91SAM9260
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_GURNARD
 	bool "Support gurnard"
 	select AT91SAM9G45
 	select BOARD_LATE_INIT
 	select DM
+	select DM_ETH
+	select DM_GPIO
 	select DM_SERIAL
 	select DM_SPI
-	select DM_GPIO
-	select DM_ETH
 	select SPI
 
 config TARGET_AT91SAM9261EK
@@ -115,8 +115,8 @@ config TARGET_PM9263
 config TARGET_AT91SAM9M10G45EK
 	bool "Atmel AT91SAM9M10G45-EK board"
 	select AT91SAM9M10G45
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 
 config TARGET_PM9G45
 	bool "Ronetix pm9g45 board"
@@ -130,8 +130,8 @@ config TARGET_PICOSAM9G45
 config TARGET_AT91SAM9N12EK
 	bool "Atmel AT91SAM9N12-EK board"
 	select AT91SAM9N12
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 
 config TARGET_AT91SAM9RLEK
 	bool "Atmel at91sam9rl reference board"
@@ -141,28 +141,28 @@ config TARGET_AT91SAM9RLEK
 config TARGET_AT91SAM9X5EK
 	bool "Atmel AT91SAM9X5-EK board"
 	select AT91SAM9X5
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select SUPPORT_SPL
 
 config TARGET_SAMA5D2_PTC_EK
 	bool "SAMA5D2 PTC EK board"
-	select SAMA5D2
 	select BOARD_EARLY_INIT_F
+	select SAMA5D2
 
 config TARGET_SAMA5D2_XPLAINED
 	bool "SAMA5D2 Xplained board"
-	select SAMA5D2
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select SAMA5D2
+	select SUPPORT_SPL
 
 config TARGET_SAMA5D27_SOM1_EK
 	bool "SAMA5D27 SOM1 EK board"
-	select CPU_V7A
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select CPU_V7A
+	select SUPPORT_SPL
 	help
 	  The SAMA5D27 SOM1 embeds SAMA5D2 SiP(System in Package),
 	  a 64Mbit QSPI flash, KSZ8081 Phy and a Mac-address EEPROM
@@ -172,30 +172,30 @@ config TARGET_SAMA5D27_SOM1_EK
 
 config TARGET_SAMA5D3_XPLAINED
 	bool "SAMA5D3 Xplained board"
+	select BOARD_EARLY_INIT_F
 	select SAMA5D3
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 
 config TARGET_SAMA5D3XEK
 	bool "SAMA5D3X-EK board"
-	select SAMA5D3
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select SAMA5D3
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 
 config TARGET_SAMA5D4_XPLAINED
 	bool "SAMA5D4 Xplained board"
-	select SAMA5D4
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select SAMA5D4
+	select SUPPORT_SPL
 
 config TARGET_SAMA5D4EK
 	bool "SAMA5D4 Evaluation Kit"
-	select SAMA5D4
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
+	select SAMA5D4
+	select SUPPORT_SPL
 
 config TARGET_MEESC
 	bool "Support meesc"
@@ -204,39 +204,39 @@ config TARGET_MEESC
 config TARGET_CORVUS
 	bool "Support corvus"
 	select AT91SAM9M10G45
-	select SUPPORT_SPL
 	select DM
-	select DM_SERIAL
-	select DM_GPIO
 	select DM_ETH
+	select DM_GPIO
+	select DM_SERIAL
+	select SUPPORT_SPL
 
 config TARGET_TAURUS
 	bool "Support taurus"
 	select AT91SAM9G20
-	select SUPPORT_SPL
 	select DM
+	select DM_ETH
+	select DM_GPIO
 	select DM_SERIAL
 	select DM_SPI
-	select DM_GPIO
-	select DM_ETH
 	select SPI
+	select SUPPORT_SPL
 
 config TARGET_SMARTWEB
 	bool "Support smartweb"
 	select AT91SAM9260
-	select SUPPORT_SPL
 	select DM
-	select DM_SERIAL
-	select DM_GPIO
 	select DM_ETH
+	select DM_GPIO
+	select DM_SERIAL
+	select SUPPORT_SPL
 
 config TARGET_VINCO
 	bool "Support VINCO"
-	select SAMA5D4
-	select SUPPORT_SPL
 	select DM
 	select DM_SPI
+	select SAMA5D4
 	select SPI
+	select SUPPORT_SPL
 
 config TARGET_WB45N
 	bool "Support Laird WB45N"
@@ -245,10 +245,10 @@ config TARGET_WB45N
 
 config TARGET_WB50N
 	bool "Support Laird WB50N"
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select CPU_V7A
 	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
 
 endchoice
 
diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig
index 3654670442..1bb373bf2d 100644
--- a/arch/arm/mach-imx/mx5/Kconfig
+++ b/arch/arm/mach-imx/mx5/Kconfig
@@ -1,14 +1,14 @@
 if ARCH_MX5
 
 config MX5
-	select GPT_TIMER
 	bool
 	default y
+	select GPT_TIMER
 
 config MX51
 	bool
-	select SYS_FSL_ERRATUM_ESDHC_A001
 	select ARM_CORTEX_A8_CVE_2017_5715
+	select SYS_FSL_ERRATUM_ESDHC_A001
 
 config MX53
 	bool
@@ -21,13 +21,13 @@ choice
 config TARGET_KP_IMX53
 	bool "Support K+P imx53 board"
 	select BOARD_LATE_INIT
-	select MX53
 	select DM
-	select DM_SERIAL
 	select DM_ETH
-	select DM_I2C
 	select DM_GPIO
+	select DM_I2C
 	select DM_PMIC
+	select DM_SERIAL
+	select MX53
 
 config TARGET_MX51EVK
 	bool "Support mx51evk"
@@ -41,9 +41,9 @@ config TARGET_MX53ARD
 config TARGET_MX53CX9020
 	bool "Support CX9020"
 	select BOARD_LATE_INIT
-	select MX53
 	select DM
 	select DM_SERIAL
+	select MX53
 
 config TARGET_MX53EVK
 	bool "Support mx53evk"
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 8bd4d68adc..2ae4fb3186 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -1,89 +1,89 @@
 if ARCH_MX6
 
 config MX6_SMP
+	bool
 	select ARM_ERRATA_751472
 	select ARM_ERRATA_761320
 	select ARM_ERRATA_794072
 	select ARM_ERRATA_845369
 	select MP
-	bool
 
 config MX6
-	select ARM_ERRATA_743622 if !MX6UL && !MX6ULL
-	select GPT_TIMER if !MX6UL && !MX6ULL
 	bool
 	default y
+	select ARM_ERRATA_743622 if !MX6UL && !MX6ULL
+	select GPT_TIMER if !MX6UL && !MX6ULL
 	imply CMD_FUSE
 
 config MX6D
+	bool
 	select HAS_CAAM
 	select MX6_SMP
-	bool
 
 config MX6DL
+	bool
 	select HAS_CAAM
 	select MX6_SMP
-	bool
 
 config MX6Q
+	bool
 	select HAS_CAAM
 	select MX6_SMP
-	bool
 
 config MX6QDL
+	bool
 	select HAS_CAAM
 	select MX6_SMP
-	bool
 
 config MX6S
-	select HAS_CAAM
 	bool
+	select HAS_CAAM
 
 config MX6SL
 	bool
 
 config MX6SX
+	bool
 	select HAS_CAAM
 	select ROM_UNIFIED_SECTIONS
-	bool
 
 config MX6SLL
-	select ROM_UNIFIED_SECTIONS
 	bool
+	select ROM_UNIFIED_SECTIONS
 
 config MX6UL
+	bool
 	select HAS_CAAM
-	select SYS_L2CACHE_OFF
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
-	bool
+	select SYS_L2CACHE_OFF
 
 config MX6UL_LITESOM
 	bool
-	select MX6UL
 	select DM
 	select DM_THERMAL
+	select MX6UL
 	select SUPPORT_SPL
 
 config MX6UL_OPOS6UL
 	bool
-	select MX6UL
 	select BOARD_LATE_INIT
 	select DM
 	select DM_GPIO
 	select DM_MMC
 	select DM_THERMAL
-	select SUPPORT_SPL
+	select MX6UL
 	select SPL_DM if SPL
 	select SPL_OF_CONTROL if SPL
-	select SPL_SEPARATE_BSS if SPL
 	select SPL_PINCTRL if SPL
+	select SPL_SEPARATE_BSS if SPL
+	select SUPPORT_SPL
 
 config MX6ULL
-	select SYS_L2CACHE_OFF
+	bool
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
-	bool
+	select SYS_L2CACHE_OFF
 
 config MX6_DDRCAL
 	bool "Include dynamic DDR calibration routines"
@@ -106,10 +106,10 @@ config TARGET_ADVANTECH_DMS_BA16
 config TARGET_APALIS_IMX6
 	bool "Toradex Apalis iMX6 board"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
 	select DM_THERMAL
+	select SUPPORT_SPL
 	imply CMD_SATA
 
 config TARGET_ARISTAINETOS
@@ -125,28 +125,28 @@ config TARGET_ARISTAINETOS2B
 
 config TARGET_CGTQMX6EVAL
 	bool "cgtqmx6eval"
-	select MX6QDL
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
+	select MX6QDL
+	select SUPPORT_SPL
 
 config TARGET_CM_FX6
 	bool "CM-FX6"
-	select SUPPORT_SPL
-	select MX6QDL
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
+	select MX6QDL
+	select SUPPORT_SPL
 
 config TARGET_COLIBRI_IMX6
 	bool "Toradex Colibri iMX6 board"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
 	select DM_THERMAL
+	select SUPPORT_SPL
 
 config TARGET_COLIBRI_IMX6ULL
 	bool "Toradex Colibri iMX6ULL"
@@ -157,19 +157,19 @@ config TARGET_COLIBRI_IMX6ULL
 
 config TARGET_DHCOMIMX6
 	bool "dh_imx6"
-	select MX6QDL
-	select BOARD_LATE_INIT
 	select BOARD_EARLY_INIT_F
-	select SUPPORT_SPL
+	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select MX6QDL
+	select SUPPORT_SPL
 	imply CMD_SPL
 
 config TARGET_DISPLAY5
 	bool "LWN DISPLAY5 board"
-	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL
+	select SUPPORT_SPL
 
 config TARGET_EMBESTMX6BOARDS
 	bool "embestmx6boards"
@@ -199,8 +199,8 @@ config TARGET_MCCMON6
 
 config TARGET_MX6CUBOXI
 	bool "Solid-run mx6 boards"
-	select MX6QDL
 	select BOARD_LATE_INIT
+	select MX6QDL
 	select SUPPORT_SPL
 
 config TARGET_MX6LOGICPD
@@ -230,9 +230,6 @@ config TARGET_MX6QARM2
 
 config TARGET_MX6DL_MAMOJ
 	bool "Support BTicino Mamoj"
-	select MX6QDL
-	select OF_CONTROL
-	select PINCTRL
 	select DM
 	select DM_ETH
 	select DM_GPIO
@@ -241,59 +238,62 @@ config TARGET_MX6DL_MAMOJ
 	select DM_PMIC
 	select DM_PMIC_PFUZE100
 	select DM_THERMAL
+	select MX6QDL
+	select OF_CONTROL
+	select PINCTRL
 	select SPL
-	select SUPPORT_SPL
 	select SPL_DM if SPL
-	select SPL_OF_LIBFDT if SPL
-	select SPL_OF_CONTROL if SPL
-	select SPL_PINCTRL if SPL
-	select SPL_SEPARATE_BSS if SPL
 	select SPL_GPIO_SUPPORT if SPL
 	select SPL_LIBCOMMON_SUPPORT if SPL
 	select SPL_LIBDISK_SUPPORT if SPL
 	select SPL_LIBGENERIC_SUPPORT if SPL
 	select SPL_MMC_SUPPORT if SPL
+	select SPL_OF_CONTROL if SPL
+	select SPL_OF_LIBFDT if SPL
+	select SPL_PINCTRL if SPL
+	select SPL_SEPARATE_BSS if SPL
 	select SPL_SERIAL_SUPPORT if SPL
-	select SPL_USB_HOST_SUPPORT if SPL
 	select SPL_USB_GADGET_SUPPORT if SPL
+	select SPL_USB_HOST_SUPPORT if SPL
 	select SPL_USB_SDP_SUPPORT if SPL
 	select SPL_WATCHDOG_SUPPORT if SPL
+	select SUPPORT_SPL
 
 config TARGET_MX6Q_ENGICAM
 	bool "Support Engicam i.Core(RQS)"
 	select BOARD_LATE_INIT
-	select MX6QDL
-	select OF_CONTROL
-	select SPL_OF_LIBFDT
 	select DM
 	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
 	select DM_THERMAL
-	select SUPPORT_SPL
+	select MX6QDL
+	select OF_CONTROL
 	select SPL_DM if SPL
 	select SPL_OF_CONTROL if SPL
-	select SPL_SEPARATE_BSS if SPL
+	select SPL_OF_LIBFDT
 	select SPL_PINCTRL if SPL
+	select SPL_SEPARATE_BSS if SPL
+	select SUPPORT_SPL
 
 config TARGET_MX6SABREAUTO
 	bool "mx6sabreauto"
-	select MX6QDL
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
-	select BOARD_EARLY_INIT_F
+	select MX6QDL
+	select SUPPORT_SPL
 
 config TARGET_MX6SABRESD
 	bool "mx6sabresd"
-	select MX6QDL
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
-	select BOARD_EARLY_INIT_F
+	select MX6QDL
+	select SUPPORT_SPL
 
 config TARGET_MX6SLEVK
 	bool "mx6slevk"
@@ -303,73 +303,73 @@ config TARGET_MX6SLEVK
 config TARGET_MX6SLLEVK
 	bool "mx6sll evk"
 	select BOARD_LATE_INIT
-	select MX6SLL
 	select DM
 	select DM_THERMAL
+	select MX6SLL
 
 config TARGET_MX6SXSABRESD
 	bool "mx6sxsabresd"
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select MX6SX
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
-	select BOARD_EARLY_INIT_F
+	select MX6SX
+	select SUPPORT_SPL
 
 config TARGET_MX6SXSABREAUTO
 	bool "mx6sxsabreauto"
+	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
-	select MX6SX
 	select DM
 	select DM_THERMAL
-	select BOARD_EARLY_INIT_F
+	select MX6SX
 
 config TARGET_MX6UL_9X9_EVK
 	bool "mx6ul_9x9_evk"
 	select BOARD_LATE_INIT
-	select MX6UL
 	select DM
 	select DM_THERMAL
+	select MX6UL
 	select SUPPORT_SPL
 
 config TARGET_MX6UL_14X14_EVK
-	select BOARD_LATE_INIT
 	bool "mx6ul_14x14_evk"
-	select MX6UL
+	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select MX6UL
 	select SUPPORT_SPL
 
 config TARGET_MX6UL_ENGICAM
 	bool "Support Engicam GEAM6UL/Is.IoT"
 	select BOARD_LATE_INIT
-	select MX6UL
-	select OF_CONTROL
 	select DM
 	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
 	select DM_THERMAL
-	select SUPPORT_SPL
+	select MX6UL
+	select OF_CONTROL
 	select SPL_DM if SPL
 	select SPL_OF_CONTROL if SPL
-	select SPL_SEPARATE_BSS if SPL
 	select SPL_PINCTRL if SPL
+	select SPL_SEPARATE_BSS if SPL
+	select SUPPORT_SPL
 
 config TARGET_MX6ULL_14X14_EVK
 	bool "Support mx6ull_14x14_evk"
 	select BOARD_LATE_INIT
-	select MX6ULL
 	select DM
 	select DM_THERMAL
+	select MX6ULL
 
 config TARGET_NITROGEN6X
 	bool "nitrogen6x"
-	imply USB_HOST_ETHER
 	imply USB_ETHER_ASIX
-	imply USB_ETHER_SMSC95XX
 	imply USB_ETHER_MCS7830
+	imply USB_ETHER_SMSC95XX
+	imply USB_HOST_ETHER
 
 config TARGET_OPOS6ULDEV
 	bool "Armadeus OPOS6ULDev board"
@@ -404,8 +404,8 @@ config TARGET_PCM058
 
 config TARGET_PFLA02
 	bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad"
-	select MX6QDL
 	select BOARD_LATE_INIT
+	select MX6QDL
 	select SUPPORT_SPL
 
 config TARGET_SECOMX6
@@ -423,12 +423,12 @@ config TARGET_TITANIUM
 
 config TARGET_KP_IMX6Q_TPC
 	bool "K+P KP_IMX6Q_TPC i.MX6 Quad"
-	select MX6QDL
-	select BOARD_LATE_INIT
 	select BOARD_EARLY_INIT_F
-	select SUPPORT_SPL
+	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select MX6QDL
+	select SUPPORT_SPL
 	imply CMD_SPL
 
 config TARGET_TQMA6
@@ -437,57 +437,57 @@ config TARGET_TQMA6
 
 config TARGET_UDOO
 	bool "udoo"
-	select MX6QDL
 	select BOARD_LATE_INIT
+	select MX6QDL
 	select SUPPORT_SPL
 
 config TARGET_UDOO_NEO
 	bool "UDOO Neo"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
-	select MX6SX
 	select DM
 	select DM_THERMAL
+	select MX6SX
+	select SUPPORT_SPL
 
 config TARGET_SAMTEC_VINING_2000
 	bool "samtec VIN|ING 2000"
 	select BOARD_LATE_INIT
-	select MX6SX
 	select DM
 	select DM_THERMAL
+	select MX6SX
 
 config TARGET_WANDBOARD
 	bool "wandboard"
-	select MX6QDL
 	select BOARD_LATE_INIT
+	select MX6QDL
 	select SUPPORT_SPL
 
 config TARGET_WARP
 	bool "WaRP"
-	select MX6SL
 	select BOARD_LATE_INIT
+	select MX6SL
 
 config TARGET_XPRESS
 	bool "CCV xPress"
 	select BOARD_LATE_INIT
-	select MX6UL
 	select DM
 	select DM_THERMAL
+	select MX6UL
 	select SUPPORT_SPL
 
 config TARGET_ZC5202
 	bool "zc5202"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
+	select SUPPORT_SPL
 
 config TARGET_ZC5601
 	bool "zc5601"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
 	select DM
 	select DM_THERMAL
+	select SUPPORT_SPL
 
 endchoice
 
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 944585ba77..60783ab78a 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -2,19 +2,19 @@ if ARCH_MX7
 
 config MX7
 	bool
+	default y
+	select ARCH_SUPPORT_PSCI
+	select CPU_V7_HAS_NONSEC
+	select CPU_V7_HAS_VIRT
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
-	select CPU_V7_HAS_VIRT
-	select CPU_V7_HAS_NONSEC
-	select ARCH_SUPPORT_PSCI
 	imply CMD_FUSE
-	default y
 
 config MX7D
+	bool
 	select HAS_CAAM
 	select ROM_UNIFIED_SECTIONS
 	imply CMD_FUSE
-	bool
 
 choice
 	prompt "MX7 board select"
@@ -22,32 +22,32 @@ choice
 
 config TARGET_CL_SOM_IMX7
 	bool "CL-SOM-iMX7"
-	select MX7D
 	select DM
 	select DM_THERMAL
+	select MX7D
 	select SUPPORT_SPL
 
 config TARGET_MX7DSABRESD
 	bool "mx7dsabresd"
 	select BOARD_LATE_INIT
-	select MX7D
 	select DM
 	select DM_THERMAL
+	select MX7D
 
 config TARGET_PICO_IMX7D
 	bool "pico-imx7d"
 	select BOARD_LATE_INIT
-	select MX7D
 	select DM
 	select DM_THERMAL
+	select MX7D
 	select SUPPORT_SPL
 
 config TARGET_WARP7
 	bool "warp7"
 	select BOARD_LATE_INIT
-	select MX7D
 	select DM
 	select DM_THERMAL
+	select MX7D
 
 config TARGET_COLIBRI_IMX7
 	bool "Support Colibri iMX7S/iMX7D modules"
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 76da6d911e..94d9d868f8 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -31,9 +31,11 @@ config TARGET_AM335X_EVM
 	bool "Support am335x_evm"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select TI_I2C_BOARD_DETECT
+	imply SPL_DM
+	imply SPL_DM_SEQ_ALIAS
 	imply SPL_ENV_SUPPORT
 	imply SPL_EXT_SUPPORT
 	imply SPL_FAT_SUPPORT
@@ -44,15 +46,13 @@ config TARGET_AM335X_EVM
 	imply SPL_LIBGENERIC_SUPPORT
 	imply SPL_MMC_SUPPORT
 	imply SPL_NAND_SUPPORT
+	imply SPL_OF_LIBFDT
 	imply SPL_POWER_SUPPORT
+	imply SPL_SEPARATE_BSS
 	imply SPL_SERIAL_SUPPORT
+	imply SPL_SYS_MALLOC_SIMPLE
 	imply SPL_WATCHDOG_SUPPORT
 	imply SPL_YMODEM_SUPPORT
-	imply SPL_SYS_MALLOC_SIMPLE
-	imply SPL_SEPARATE_BSS
-	imply SPL_DM
-	imply SPL_DM_SEQ_ALIAS
-	imply SPL_OF_LIBFDT
 	help
 	  This option specifies support for the AM335x
 	  GP and HS EVM development platforms. The AM335x
@@ -65,30 +65,30 @@ config TARGET_AM335X_BALTOS
 	bool "Support am335x_baltos"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_AM335X_IGEP003X
 	bool "Support am335x_igep003x"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_AM335X_SHC
 	bool "Support am335x based shc board from bosch"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	imply CMD_SPL
 
 config TARGET_AM335X_SL50
 	bool "Support am335x_sl50"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_BAV335X
 	bool "Support bav335x"
@@ -122,68 +122,68 @@ config TARGET_CHILIBOARD
 config TARGET_CM_T335
 	bool "Support cm_t335"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_DRACO
 	bool "Support draco"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_ETAMIN
 	bool "Support etamin"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_PCM051
 	bool "Support pcm051"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_PENGWYN
 	bool "Support pengwyn"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_PEPPER
 	bool "Support pepper"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_PXM2
 	bool "Support pxm2"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_RASTABAN
 	bool "Support rastaban"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_RUT
 	bool "Support rut"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_THUBAN
 	bool "Support thuban"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_PDU001
 	bool "Support PDU001"
@@ -258,6 +258,8 @@ endif
 if AM43XX || AM33XX
 config ISW_ENTRY_ADDR
 	hex "Address in memory or XIP flash of bootloader entry point"
+	default 0x402F4000 if AM43XX
+	default 0x402F0400 if AM33XX
 	help
 	  After any reset, the boot ROM on the AM43XX SOC
 	  searches the boot media for a valid boot image.
@@ -268,11 +270,10 @@ config ISW_ENTRY_ADDR
 	  point address depending on the device type
 	  (secure/non-secure), boot media (xip/non-xip) and
 	  image headers.
-	default 0x402F4000 if AM43XX
-	default 0x402F0400 if AM33XX
 
 config PUB_ROM_DATA_SIZE
 	hex "Size in bytes of the L3 SRAM reserved by ROM to store data"
+	default 0x8400
 	help
 	  During the device boot, the public ROM uses the top of
 	  the public L3 OCMC RAM to store r/w data like stack,
@@ -283,5 +284,4 @@ config PUB_ROM_DATA_SIZE
 	  boot image. Once the ROM transfers control to the boot
 	  image, this area is no longer used, and can be reclaimed
 	  for run time use by the boot image.
-	default 0x8400
 endif
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 6d714f6cdb..9e4227d826 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -23,10 +23,10 @@ choice
 config TARGET_AM3517_EVM
 	bool "AM3517 EVM"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
+	select DM_SERIAL
 
 config TARGET_MT_VENTOUX
 	bool "TeeJet Mt.Ventoux"
@@ -36,8 +36,8 @@ config TARGET_MT_VENTOUX
 config TARGET_OMAP3_BEAGLE
 	bool "TI OMAP3 BeagleBoard"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_5
 	select OMAP3_GPIO_6
 
@@ -56,21 +56,21 @@ config TARGET_CM_T3517
 config TARGET_DEVKIT8000
 	bool "TimLL OMAP3 Devkit8000"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_OMAP3_EVM
 	bool "TI OMAP3 EVM"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_3
 
 config TARGET_OMAP3_IGEP00X0
 	bool "IGEP"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_3
 	select OMAP3_GPIO_5
 	select OMAP3_GPIO_6
@@ -78,8 +78,8 @@ config TARGET_OMAP3_IGEP00X0
 config TARGET_OMAP3_OVERO
 	bool "OMAP35xx Gumstix Overo"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_2
 	select OMAP3_GPIO_3
 	select OMAP3_GPIO_4
@@ -89,8 +89,8 @@ config TARGET_OMAP3_OVERO
 config TARGET_OMAP3_ZOOM1
 	bool "TI Zoom1"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_AM3517_CRANE
 	bool "am3517_crane"
@@ -118,8 +118,8 @@ config TARGET_OMAP3_LOGIC
 	bool "OMAP3 Logic"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_3
 	select OMAP3_GPIO_4
 	select OMAP3_GPIO_6
@@ -143,14 +143,14 @@ config TARGET_TWISTER
 config TARGET_OMAP3_CAIRO
 	bool "QUIPOS CAIRO"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 
 config TARGET_SNIPER
 	bool "LG Optimus Black"
 	select DM
-	select DM_SERIAL
 	select DM_GPIO
+	select DM_SERIAL
 	select OMAP3_GPIO_2
 	select OMAP3_GPIO_3
 	select OMAP3_GPIO_4
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 6c492ff409..308f9de4c4 100644
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -51,25 +51,25 @@ config TARGET_GOSE
 	bool "Gose board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_KOELSCH
 	bool "Koelsch board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_LAGER
 	bool "Lager board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_KZM9G
 	bool "KZM9D board"
@@ -78,33 +78,33 @@ config TARGET_ALT
 	bool "Alt board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_SILK
 	bool "Silk board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_PORTER
 	bool "Porter board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 config TARGET_STOUT
 	bool "Stout board"
 	select DM
 	select DM_SERIAL
+	select SPL_TINY_MEMSET
 	select SUPPORT_SPL
 	select USE_TINY_PRINTF
-	select SPL_TINY_MEMSET
 
 endchoice
 
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 0fb0c63390..cd03705b64 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -22,6 +22,8 @@ config TEGRA_IVC
 
 config TEGRA_COMMON
 	bool "Tegra common options"
+	select BINMAN
+	select BOARD_EARLY_INIT_F
 	select CLK
 	select DM
 	select DM_ETH
@@ -35,11 +37,9 @@ config TEGRA_COMMON
 	select DM_SPI
 	select DM_SPI_FLASH
 	select MISC
-	select SPI
 	select OF_CONTROL
+	select SPI
 	select VIDCONSOLE_AS_LCD if DM_VIDEO
-	select BOARD_EARLY_INIT_F
-	select BINMAN
 	imply CRC32_VERIFY
 
 config TEGRA_NO_BPMP
@@ -98,8 +98,8 @@ config TEGRA124
 
 config TEGRA210
 	bool "Tegra210 family"
-	select TEGRA_GPIO
 	select TEGRA_ARMV8_COMMON
+	select TEGRA_GPIO
 	select TEGRA_NO_BPMP
 
 config TEGRA186
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index c564593451..1df1ecf72d 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -11,10 +11,10 @@ choice
 config TARGET_MICROBLAZE_GENERIC
 	bool "Support microblaze-generic"
 	select BOARD_LATE_INIT
-	select SUPPORT_SPL
-	select OF_CONTROL
 	select DM
 	select DM_SERIAL
+	select OF_CONTROL
+	select SUPPORT_SPL
 	select SYSRESET
 
 endchoice
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d07b92d1b4..315d89dbeb 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -14,13 +14,13 @@ choice
 
 config TARGET_QEMU_MIPS
 	bool "Support qemu-mips"
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_BIG_ENDIAN
-	select SUPPORTS_LITTLE_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
 	select SUPPORTS_CPU_MIPS64_R1
 	select SUPPORTS_CPU_MIPS64_R2
-	select ROM_EXCEPTION_VECTORS
+	select SUPPORTS_LITTLE_ENDIAN
 
 config TARGET_MALTA
 	bool "Support malta"
@@ -28,98 +28,98 @@ config TARGET_MALTA
 	select DM_SERIAL
 	select DYNAMIC_IO_PORT_BASE
 	select MIPS_CM
+	select MIPS_L1_CACHE_SHIFT_6
 	select MIPS_L2_CACHE
 	select OF_CONTROL
 	select OF_ISA_BUS
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_BIG_ENDIAN
-	select SUPPORTS_LITTLE_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
 	select SUPPORTS_CPU_MIPS32_R6
 	select SUPPORTS_CPU_MIPS64_R1
 	select SUPPORTS_CPU_MIPS64_R2
 	select SUPPORTS_CPU_MIPS64_R6
+	select SUPPORTS_LITTLE_ENDIAN
 	select SWAP_IO_SPACE
-	select MIPS_L1_CACHE_SHIFT_6
-	select ROM_EXCEPTION_VECTORS
 
 config TARGET_VCT
 	bool "Support vct"
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_BIG_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
 	select SYS_MIPS_CACHE_INIT_RAM_LOAD
-	select ROM_EXCEPTION_VECTORS
 
 config TARGET_DBAU1X00
 	bool "Support dbau1x00"
+	select MIPS_TUNE_4KC
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_BIG_ENDIAN
-	select SUPPORTS_LITTLE_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
+	select SUPPORTS_LITTLE_ENDIAN
 	select SYS_MIPS_CACHE_INIT_RAM_LOAD
-	select ROM_EXCEPTION_VECTORS
-	select MIPS_TUNE_4KC
 
 config TARGET_PB1X00
 	bool "Support pb1x00"
-	select SUPPORTS_LITTLE_ENDIAN
+	select MIPS_TUNE_4KC
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
+	select SUPPORTS_LITTLE_ENDIAN
 	select SYS_MIPS_CACHE_INIT_RAM_LOAD
-	select ROM_EXCEPTION_VECTORS
-	select MIPS_TUNE_4KC
 
 config ARCH_ATH79
 	bool "Support QCA/Atheros ath79"
-	select OF_CONTROL
 	select DM
+	select OF_CONTROL
 
 config ARCH_BMIPS
 	bool "Support BMIPS SoCs"
-	select OF_CONTROL
-	select DM
 	select CLK
 	select CPU
+	select DM
+	select OF_CONTROL
 	select RAM
 	select SYSRESET
 
 config MACH_PIC32
 	bool "Support Microchip PIC32"
-	select OF_CONTROL
 	select DM
+	select OF_CONTROL
 
 config TARGET_BOSTON
 	bool "Support Boston"
 	select DM
 	select DM_SERIAL
-	select OF_CONTROL
 	select MIPS_CM
 	select MIPS_L1_CACHE_SHIFT_6
 	select MIPS_L2_CACHE
 	select OF_BOARD_SETUP
+	select OF_CONTROL
+	select ROM_EXCEPTION_VECTORS
 	select SUPPORTS_BIG_ENDIAN
-	select SUPPORTS_LITTLE_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
 	select SUPPORTS_CPU_MIPS32_R2
 	select SUPPORTS_CPU_MIPS32_R6
 	select SUPPORTS_CPU_MIPS64_R1
 	select SUPPORTS_CPU_MIPS64_R2
 	select SUPPORTS_CPU_MIPS64_R6
-	select ROM_EXCEPTION_VECTORS
+	select SUPPORTS_LITTLE_ENDIAN
 
 config TARGET_XILFPGA
 	bool "Support Imagination Xilfpga"
-	select OF_CONTROL
 	select DM
-	select DM_SERIAL
-	select DM_GPIO
 	select DM_ETH
-	select SUPPORTS_LITTLE_ENDIAN
-	select SUPPORTS_CPU_MIPS32_R1
-	select SUPPORTS_CPU_MIPS32_R2
+	select DM_GPIO
+	select DM_SERIAL
 	select MIPS_L1_CACHE_SHIFT_4
+	select OF_CONTROL
 	select ROM_EXCEPTION_VECTORS
+	select SUPPORTS_CPU_MIPS32_R1
+	select SUPPORTS_CPU_MIPS32_R2
+	select SUPPORTS_LITTLE_ENDIAN
 	help
 	  This supports IMGTEC MIPSfpga platform
 
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 05d29d2fd9..385a7a6e21 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -26,8 +26,8 @@ config TARGET_MPC8308RDB
 
 config TARGET_MPC8313ERDB
 	bool "Support MPC8313ERDB"
-	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select SUPPORT_SPL
 
 config TARGET_MPC8315ERDB
 	bool "Support MPC8315ERDB"
@@ -42,10 +42,10 @@ config TARGET_MPC832XEMDS
 
 config TARGET_MPC8349EMDS
 	bool "Support MPC8349EMDS"
+	select BOARD_EARLY_INIT_F
 	select SYS_FSL_DDR
-	select SYS_FSL_HAS_DDR2
 	select SYS_FSL_DDR_BE
-	select BOARD_EARLY_INIT_F
+	select SYS_FSL_HAS_DDR2
 
 config TARGET_MPC8349ITX
 	bool "Support MPC8349ITX"
diff --git a/cmd/Kconfig b/cmd/Kconfig
index ff89065b71..a6014705dd 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -152,8 +152,8 @@ config CMD_BDI
 
 config CMD_CONFIG
 	bool "config"
-	select BUILD_BIN2C
 	default SANDBOX
+	select BUILD_BIN2C
 	help
 	  Print ".config" contents.
 
@@ -429,8 +429,8 @@ config CMD_BINOP
 
 config CMD_CRC32
 	bool "crc32"
-	select HASH
 	default y
+	select HASH
 	help
 	  Compute CRC32.
 
@@ -737,9 +737,9 @@ config CMD_GPIO
 
 config CMD_GPT
 	bool "GPT (GUID Partition Table) command"
-	select PARTITION_UUIDS
 	select EFI_PARTITION
 	select HAVE_BLOCK_DEVICE
+	select PARTITION_UUIDS
 	imply RANDOM_UUID
 	help
 	  Enable the 'gpt' command to ready and write GPT style partition
@@ -899,8 +899,8 @@ config CMD_ONENAND
 
 config CMD_PART
 	bool "part"
-	select PARTITION_UUIDS
 	select HAVE_BLOCK_DEVICE
+	select PARTITION_UUIDS
 	help
 	  Read and display information about the partition table on
 	  various media.
@@ -1798,10 +1798,10 @@ endmenu
 
 config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
+	default y if NAND_SUNXI
+	select CMD_MTDPARTS
 	select CRC32
 	select MTD_UBI
-	select CMD_MTDPARTS
-	default y if NAND_SUNXI
 	help
 	  UBI is a software layer above MTD layer which admits use of LVM-like
 	  logical volumes on top of MTD devices, hides some complexities of
@@ -1813,9 +1813,9 @@ config CMD_UBI
 config CMD_UBIFS
 	tristate "Enable UBIFS - Unsorted block images filesystem commands"
 	depends on CMD_UBI
+	default y if CMD_UBI
 	select CRC32
 	select LZO
-	default y if CMD_UBI
 	help
 	  UBIFS is a file system for flash devices which works on top of UBI.