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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e84b74efb664dddcb9de95d77a48d2b0b0f5d4a2..5e1838474e3323e022fec2b88e1fc7d13bcd40ad 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -579,6 +579,19 @@ config OMAP44XX
 config OMAP54XX
        bool "OMAP54XX SoC"
        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
        bool "AM43XX SoC"

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 5adcead185decc79957ac4a810faf9bd057e6ec7..865a8d2d04ac4c4f4288e11f42bf35ca4bb2a3b3 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -15,9 +15,20 @@ config TARGET_AM335X_EVM
        select DM_SERIAL
        select DM_GPIO
        select TI_I2C_BOARD_DETECT
-       imply SPL_YMODEM_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_YMODEM_SUPPORT
        help
          This option specifies support for the AM335x
          GP and HS EVM development platforms. The AM335x
@@ -104,19 +115,24 @@ endif
 
 if AM43XX
 
-config SPL_EXT_SUPPORT
-       default y
-
-config SPL_GPIO_SUPPORT
-       default y
-
-config SPL_I2C_SUPPORT
-       default y
-
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select BOARD_LATE_INIT
        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
          This option specifies support for the AM43xx
          GP and HS EVM development platforms.The AM437x

diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig
index c5edc7c98d4d6f6304098e2baba2d4ccbe66dbc6..4041adc9742eca1d367eaeb0987b504ebb44870a 100644 (file)
--- a/arch/arm/mach-omap2/omap5/Kconfig
+++ b/arch/arm/mach-omap2/omap5/Kconfig
@@ -1,41 +1,5 @@
 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
        prompt "OMAP5 board select"
        optional

diff --git a/board/ti/common/Kconfig b/board/ti/common/Kconfig
index 4980a047143e0846600a67720c640f5a63d27066..adf73abc9358561941f69a850b215920bec88b90 100644 (file)
--- a/board/ti/common/Kconfig
+++ b/board/ti/common/Kconfig
@@ -1,41 +1,5 @@
-config SPL_ENV_SUPPORT
-       default y
-
 config TI_I2C_BOARD_DETECT
        bool "Support for Board detection for TI platforms"
        help
           Support for detection board information on Texas Instrument's
           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