From 5ed063d10f647b7cdbd048c8acdf7d030f1a94e6 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 23 Jul 2018 15:55:13 +0200 Subject: 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 Reviewed-by: Tom Rini --- arch/arm/mach-imx/mx5/Kconfig | 12 ++-- arch/arm/mach-imx/mx6/Kconfig | 158 +++++++++++++++++++++--------------------- arch/arm/mach-imx/mx7/Kconfig | 18 ++--- 3 files changed, 94 insertions(+), 94 deletions(-) (limited to 'arch/arm/mach-imx') 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" -- cgit