diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-04-21 17:53:07 +0200 |
|---|---|---|
| committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-04-21 18:33:31 +0200 |
| commit | 1ddbcf46bfba605b65f111a9f1f6c50098957767 (patch) | |
| tree | 16625c05c233adff166bb7dd112b7044924d11a9 | |
| parent | f3dca4aac6727fde135871433a6d77d396c93e71 (diff) | |
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>
| -rw-r--r-- | configs/alt_defconfig | 1 | ||||
| -rw-r--r-- | configs/lager_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7752evb_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7753evb_defconfig | 1 | ||||
| -rw-r--r-- | configs/sh7757lcr_defconfig | 1 | ||||
| -rw-r--r-- | configs/silk_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/alt.h | 1 | ||||
| -rw-r--r-- | include/configs/lager.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7752evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7753evb.h | 1 | ||||
| -rw-r--r-- | include/configs/sh7757lcr.h | 1 | ||||
| -rw-r--r-- | include/configs/silk.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
13 files changed, 6 insertions, 7 deletions
diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 172461a7f4..19ae070895 100644 --- 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 1ce7949d74..86fab8c014 100644 --- 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 db460978aa..ed3946b34b 100644 --- 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 c747384e1b..96f30b3747 100644 --- 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 f5cc2a97d8..b6d5f47bc8 100644 --- 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 bba0ce76e7..5538186ad7 100644 --- 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 f5e41db156..d6236870b9 100644 --- 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 45a76f8010..97f7b2c7e7 100644 --- 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 e192de0623..ff1208f196 100644 --- 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 c17bc310bb..9a1d2e3368 100644 --- 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 6ca13aa5f8..94b4119c58 100644 --- 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 5d85c0df93..ba49c194db 100644 --- 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 193c7ded3f..9eba487ec4 100644 --- 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 |