mmc: sh_mmcif: Migrate configs to CONFIG_SH_MMCIF

Migrate the U-Boot configs to Kconfig CONFIG_SH_MMCIF .

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 172461a..19ae070 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 1ce7949..86fab8c 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index db46097..ed3946b 100644 (file)
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -31,6 +31,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index c747384..96f30b3 100644 (file)
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -30,6 +30,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index f5cc2a9..b6d5f47 100644 (file)
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -33,6 +33,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index bba0ce7..5538186 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/include/configs/alt.h b/include/configs/alt.h
index f5e41db..d623687 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -73,7 +73,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* MMCIF */
-#define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR           0xee200000
 #define CONFIG_SH_MMCIF_CLK            48000000
 

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 45a76f8..97f7b2c 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -72,7 +72,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 
 /* MMC */
-#define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR           0xEE220000
 #define CONFIG_SH_MMCIF_CLK            97500000
 

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index e192de0..ff1208f 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -60,7 +60,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000
 

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index c17bc31..9a1d2e3 100644 (file)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -60,7 +60,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000
 

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 6ca13aa..94b4119 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -64,7 +64,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000
 

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 5d85c0d..ba49c19 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -74,7 +74,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* MMCIF */
-#define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR   0xee200000
 #define CONFIG_SH_MMCIF_CLK    48000000
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 193c7de..9eba487 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1820,7 +1820,6 @@ CONFIG_SH_I2C_8BIT
 CONFIG_SH_I2C_CLOCK
 CONFIG_SH_I2C_DATA_HIGH
 CONFIG_SH_I2C_DATA_LOW
-CONFIG_SH_MMCIF
 CONFIG_SH_MMCIF_ADDR
 CONFIG_SH_MMCIF_CLK
 CONFIG_SH_QSPI_BASE