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 172461a7f4b98d798812444c7aa24a8ca3728cc2..19ae070895bfd01c7028463aec3ff62f6adb7b25 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 1ce7949d74162a8e37eaa08bbce559df3a4cb531..86fab8c014180a5617c25d6ef7afe0576b175916 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 db460978aa1e7f17901b3bd3842ceac412ddcdd6..ed3946b34b21aebf352a7c01ab59f1453f217062 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 c747384e1b48c0454af85ec28b99b6ae498f9d1c..96f30b374745ee40d6fe82016871291e6c3b4177 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 f5cc2a97d8ed593937b87e320e368a036d19c38e..b6d5f47bc824d104a41889063936d0c928a19b1b 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 bba0ce76e76c1b9629a9e26301762046ba4c03b0..5538186ad7de9a98e6b536856a0669ecc49e5546 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 f5e41db15673b6c3e1f14205e64fc96bfc1c261e..d6236870b9d64e9b76175c023049f7c1c37cf194 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 45a76f8010befcf94496b8242301ea813f9133f8..97f7b2c7e7884b601febff9617d0da3e35bf131a 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 e192de0623f29818d98945302bad4d41b3835241..ff1208f19628f73bb7b83078dd6ea2aa09afe313 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 c17bc310bbb3e9b7de6f3f71d64380c446b3870e..9a1d2e3368c503fa1cd7e0dadc0df95c57010742 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 6ca13aa5f8467bef304c64f5adb8df24cb85cd7f..94b4119c581117f7a29f8b5b5bb5311423883a84 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 5d85c0df932a1d24067ba63d0d22ac233c7c7d78..ba49c194db02775dd4e652925a8a539a93ec87ac 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 193c7ded3fa6d884715cd628da84ce1b860ba3fc..9eba487ec4c5e96457cfebd5dcaa26ffee0fef16 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