mmc: ftsdc010: Migrate CONFIG_FTSDC010_SDIO to Kconfig

Convert CONFIG_FTSDC010_SDIO to Kconfig.
So CONFIG_FTSDC010_SDIO can also be
removed from config_whitelist.txt.

Signed-off-by: Rick Chen <rick@andestech.com>
Signed-off-by: Rick Chen <rickchen36@gmail.com>
Cc: Greentime Hu <green.hu@gmail.com>

diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig
index f3eabea..4351524 100644 (file)
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -26,6 +26,7 @@ CONFIG_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_NDS32=y
 CONFIG_FTSDC010=y
+CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y

diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 742d904..05a5e28 100644 (file)
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -23,6 +23,7 @@ CONFIG_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_NDS32=y
 CONFIG_FTSDC010=y
+CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_FTMAC100=y

diff --git a/configs/nx25-ae250_defconfig b/configs/nx25-ae250_defconfig
index 47b83db..ab88910 100644 (file)
--- a/configs/nx25-ae250_defconfig
+++ b/configs/nx25-ae250_defconfig
@@ -24,6 +24,7 @@ CONFIG_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_NDS32=y
 CONFIG_FTSDC010=y
+CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 5f67e33..ff987ed 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -535,6 +535,13 @@ config FTSDC010
        help
          This SD/MMC controller is present in Andestech SoCs which is based on Faraday IP.
 
+config FTSDC010_SDIO
+       bool "Support ftsdc010 sdio"
+       default n
+       depends on FTSDC010
+       help
+               This can enable ftsdc010 sdio function.
+
 endif
 
 config TEGRA124_MMC_DISABLE_EXT_LOOPBACK

diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index 2ee808d..1ebbc4c 100644 (file)
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -81,11 +81,6 @@
 #define CONFIG_SYS_NS16550_CLK         ((18432000 * 20) / 25)  /* AG101P */
 
 /*
- * SD (MMC) controller
- */
-#define CONFIG_FTSDC010_SDIO
-
-/*
  * Miscellaneous configurable options
  */
 

diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 499a424..ff365c4 100644 (file)
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -83,11 +83,6 @@
 #define CONFIG_SYS_NS16550_CLK         ((18432000 * 20) / 25)  /* AG101P */
 
 /*
- * SD (MMC) controller
- */
-#define CONFIG_FTSDC010_SDIO
-
-/*
  * Miscellaneous configurable options
  */
 

diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h
index f3e65e3..3c888fd 100644 (file)
--- a/include/configs/nx25-ae250.h
+++ b/include/configs/nx25-ae250.h
@@ -70,11 +70,6 @@
 #endif
 #define CONFIG_SYS_NS16550_CLK         19660800
 
-/*
- * SD (MMC) controller
- */
-#define CONFIG_FTSDC010_SDIO
-
 /* Init Stack Pointer */
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000000 - \
                                        GENERATED_GBL_DATA_SIZE)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 46b7f29..2c26d34 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -741,7 +741,6 @@ CONFIG_FTPWM010_BASE
 CONFIG_FTRTC010_BASE
 CONFIG_FTRTC010_EXTCLK
 CONFIG_FTRTC010_PCLK
-CONFIG_FTSDC010_SDIO
 CONFIG_FTSDMC021
 CONFIG_FTSDMC021_BASE
 CONFIG_FTSMC020