diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-10 13:32:07 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-01-11 19:40:15 +0900 |
| commit | 1d2c0506d31a9997e5ffc22e90942902f673b107 (patch) | |
| tree | a2b91cf78bee469f9fea66e7cbc70d026e935dc1 /arch/arm/cpu/arm926ejs | |
| parent | 0ec6eb54959d061def8505a28e438395140d9f52 (diff) | |
| download | u-boot-1d2c0506d31a9997e5ffc22e90942902f673b107.tar.gz u-boot-1d2c0506d31a9997e5ffc22e90942902f673b107.tar.xz u-boot-1d2c0506d31a9997e5ffc22e90942902f673b107.zip | |
mmc: move more driver config options to Kconfig
Move (and rename) the following CONFIG options to Kconfig:
CONFIG_DAVINCI_MMC (renamed to CONFIG_MMC_DAVINCI)
CONFIG_OMAP_HSMMC (renamed to CONFIG_MMC_OMAP_HS)
CONFIG_MXC_MMC (renamed to CONFIG_MMC_MXC)
CONFIG_MXS_MMC (renamed to CONFIG_MMC_MXS)
CONFIG_TEGRA_MMC (renamed to CONFIG_MMC_SDHCI_TEGRA)
CONFIG_SUNXI_MMC (renamed to CONFIG_MMC_SUNXI)
They are the same option names as used in Linux.
This commit was created as follows:
[1] Rename the options with the following command:
find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \
-type f -print | xargs sed -i -e '
s/CONFIG_DAVINCI_MMC/CONFIG_MMC_DAVINCI/g
s/CONFIG_OMAP_HSMMC/CONFIG_MMC_OMAP_HS/g
s/CONFIG_MXC_MMC/CONFIG_MMC_MXC/g
s/CONFIG_MXS_MMC/CONFIG_MMC_MXS/g
s/CONFIG_TEGRA_MMC/CONFIG_MMC_SDHCI_TEGRA/g
s/CONFIG_SUNXI_MMC/CONFIG_MMC_SUNXI/g
'
[2] Commit the changes
[3] Create entries in driver/mmc/Kconfig.
(copied from Linux)
[4] Move the options with the following command
tools/moveconfig.py -y -r HEAD \
MMC_DAVINCI MMC_OMAP_HS MMC_MXC MMC_MXS MMC_SDHCI_TEGRA MMC_SUNXI
[5] Sort and align drivers/mmc/Makefile for readability
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index b713c84519..3b4326afef 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -13,7 +13,7 @@ #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/imx-common/sys_proto.h> -#ifdef CONFIG_MXC_MMC +#ifdef CONFIG_MMC_MXC #include <asm/arch/mxcmmc.h> #endif @@ -196,7 +196,7 @@ int cpu_eth_init(bd_t *bis) */ int cpu_mmc_init(bd_t *bis) { -#ifdef CONFIG_MXC_MMC +#ifdef CONFIG_MMC_MXC return mxc_mmc_init(bis); #else return 0; @@ -340,7 +340,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) } #endif /* CONFIG_FEC_MXC */ -#ifdef CONFIG_MXC_MMC +#ifdef CONFIG_MMC_MXC void mx27_sd1_init_pins(void) { int i; @@ -374,7 +374,7 @@ void mx27_sd2_init_pins(void) imx_gpio_mode(mode[i]); } -#endif /* CONFIG_MXC_MMC */ +#endif /* CONFIG_MMC_MXC */ #ifndef CONFIG_SYS_DCACHE_OFF void enable_caches(void) |