Browse Source

TI: Migrate board/ti/common/Kconfig to imply

The option that we had set in board/ti/common/Kconfig as default y are
best done with imply under the appropriate main Kconfig option instead.

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 8 years ago
parent
commit
9d4f7a311f
4 changed files with 39 additions and 82 deletions
  1. 13 0
      arch/arm/Kconfig
  2. 26 10
      arch/arm/mach-omap2/am33xx/Kconfig
  3. 0 36
      arch/arm/mach-omap2/omap5/Kconfig
  4. 0 36
      board/ti/common/Kconfig

+ 13 - 0
arch/arm/Kconfig

@@ -579,6 +579,19 @@ config OMAP44XX
 config OMAP54XX
 config OMAP54XX
 	bool "OMAP54XX SoC"
 	bool "OMAP54XX SoC"
 	select ARCH_OMAP2
 	select ARCH_OMAP2
+	imply SPL_DISPLAY_PRINT
+	imply SPL_ENV_SUPPORT
+	imply SPL_EXT_SUPPORT
+	imply SPL_FAT_SUPPORT
+	imply SPL_GPIO_SUPPORT
+	imply SPL_I2C_SUPPORT
+	imply SPL_LIBCOMMON_SUPPORT
+	imply SPL_LIBDISK_SUPPORT
+	imply SPL_LIBGENERIC_SUPPORT
+	imply SPL_MMC_SUPPORT
+	imply SPL_NAND_SUPPORT
+	imply SPL_POWER_SUPPORT
+	imply SPL_SERIAL_SUPPORT
 
 
 config AM43XX
 config AM43XX
 	bool "AM43XX SoC"
 	bool "AM43XX SoC"

+ 26 - 10
arch/arm/mach-omap2/am33xx/Kconfig

@@ -15,9 +15,20 @@ config TARGET_AM335X_EVM
 	select DM_SERIAL
 	select DM_SERIAL
 	select DM_GPIO
 	select DM_GPIO
 	select TI_I2C_BOARD_DETECT
 	select TI_I2C_BOARD_DETECT
-	imply SPL_YMODEM_SUPPORT
 	imply SPL_ENV_SUPPORT
 	imply SPL_ENV_SUPPORT
+	imply SPL_EXT_SUPPORT
+	imply SPL_FAT_SUPPORT
+	imply SPL_GPIO_SUPPORT
+	imply SPL_I2C_SUPPORT
+	imply SPL_LIBCOMMON_SUPPORT
+	imply SPL_LIBDISK_SUPPORT
+	imply SPL_LIBGENERIC_SUPPORT
+	imply SPL_MMC_SUPPORT
+	imply SPL_NAND_SUPPORT
+	imply SPL_POWER_SUPPORT
+	imply SPL_SERIAL_SUPPORT
 	imply SPL_WATCHDOG_SUPPORT
 	imply SPL_WATCHDOG_SUPPORT
+	imply SPL_YMODEM_SUPPORT
 	help
 	help
 	  This option specifies support for the AM335x
 	  This option specifies support for the AM335x
 	  GP and HS EVM development platforms. The AM335x
 	  GP and HS EVM development platforms. The AM335x
@@ -104,19 +115,24 @@ endif
 
 
 if AM43XX
 if AM43XX
 
 
-config SPL_EXT_SUPPORT
-	default y
-
-config SPL_GPIO_SUPPORT
-	default y
-
-config SPL_I2C_SUPPORT
-	default y
-
 config TARGET_AM43XX_EVM
 config TARGET_AM43XX_EVM
 	bool "Support am43xx_evm"
 	bool "Support am43xx_evm"
 	select BOARD_LATE_INIT
 	select BOARD_LATE_INIT
 	select TI_I2C_BOARD_DETECT
 	select TI_I2C_BOARD_DETECT
+	imply SPL_ENV_SUPPORT
+	imply SPL_EXT_SUPPORT
+	imply SPL_FAT_SUPPORT
+	imply SPL_GPIO_SUPPORT
+	imply SPL_I2C_SUPPORT
+	imply SPL_LIBCOMMON_SUPPORT
+	imply SPL_LIBDISK_SUPPORT
+	imply SPL_LIBGENERIC_SUPPORT
+	imply SPL_MMC_SUPPORT
+	imply SPL_NAND_SUPPORT
+	imply SPL_POWER_SUPPORT
+	imply SPL_SERIAL_SUPPORT
+	imply SPL_WATCHDOG_SUPPORT
+	imply SPL_YMODEM_SUPPORT
 	help
 	help
 	  This option specifies support for the AM43xx
 	  This option specifies support for the AM43xx
 	  GP and HS EVM development platforms.The AM437x
 	  GP and HS EVM development platforms.The AM437x

+ 0 - 36
arch/arm/mach-omap2/omap5/Kconfig

@@ -1,41 +1,5 @@
 if OMAP54XX
 if OMAP54XX
 
 
-config SPL_EXT_SUPPORT
-	default y
-
-config SPL_FAT_SUPPORT
-	default y
-
-config SPL_GPIO_SUPPORT
-	default y
-
-config SPL_I2C_SUPPORT
-	default y
-
-config SPL_LIBCOMMON_SUPPORT
-	default y
-
-config SPL_LIBDISK_SUPPORT
-	default y
-
-config SPL_LIBGENERIC_SUPPORT
-	default y
-
-config SPL_MMC_SUPPORT
-	default y
-
-config SPL_NAND_SUPPORT
-	default y
-
-config SPL_POWER_SUPPORT
-	default y
-
-config SPL_SERIAL_SUPPORT
-	default y
-
-config SPL_DISPLAY_PRINT
-	default y
-
 choice
 choice
 	prompt "OMAP5 board select"
 	prompt "OMAP5 board select"
 	optional
 	optional

+ 0 - 36
board/ti/common/Kconfig

@@ -1,41 +1,5 @@
-config SPL_ENV_SUPPORT
-	default y
-
 config TI_I2C_BOARD_DETECT
 config TI_I2C_BOARD_DETECT
 	bool "Support for Board detection for TI platforms"
 	bool "Support for Board detection for TI platforms"
 	help
 	help
 	   Support for detection board information on Texas Instrument's
 	   Support for detection board information on Texas Instrument's
 	   Evaluation Boards which have I2C based EEPROM detection
 	   Evaluation Boards which have I2C based EEPROM detection
-
-config SPL_EXT_SUPPORT
-	default y
-
-config SPL_FAT_SUPPORT
-	default y
-
-config SPL_GPIO_SUPPORT
-	default y
-
-config SPL_I2C_SUPPORT
-	default y
-
-config SPL_LIBCOMMON_SUPPORT
-	default y
-
-config SPL_LIBDISK_SUPPORT
-	default y
-
-config SPL_LIBGENERIC_SUPPORT
-	default y
-
-config SPL_MMC_SUPPORT
-	default y
-
-config SPL_NAND_SUPPORT
-	default y
-
-config SPL_POWER_SUPPORT
-	default y
-
-config SPL_SERIAL_SUPPORT
-	default y