From: Rick Chen Date: Tue, 20 Mar 2018 07:10:49 +0000 (+0800) Subject: mmc: ftsdc010: Migrate CONFIG_FTSDC010_SDIO to Kconfig X-Git-Tag: v2018.05-rc1~4^2~3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=095c9f35d5a04ed0907624479f702f6fce7591bb;p=u-boot 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 Signed-off-by: Rick Chen Cc: Greentime Hu --- diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig index f3eabea70e..43515241c0 100644 --- 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 742d9046ad..05a5e2817e 100644 --- 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 47b83db5ea..ab889101cd 100644 --- 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 5f67e336db..ff987ed803 100644 --- 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 2ee808d08c..1ebbc4c9e2 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -80,11 +80,6 @@ #endif #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 499a424d8a..ff365c464e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -82,11 +82,6 @@ #endif #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 f3e65e37a6..3c888fdd50 100644 --- 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 46b7f292c0..2c26d34ce4 100644 --- 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