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 /board/nvidia | |
parent | 0ec6eb54959d061def8505a28e438395140d9f52 (diff) |
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 'board/nvidia')
-rw-r--r-- | board/nvidia/cardhu/cardhu.c | 2 | ||||
-rw-r--r-- | board/nvidia/dalmore/dalmore.c | 2 | ||||
-rw-r--r-- | board/nvidia/harmony/harmony.c | 2 | ||||
-rw-r--r-- | board/nvidia/seaboard/seaboard.c | 2 | ||||
-rw-r--r-- | board/nvidia/whistler/whistler.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c index f04f843c314..2ad996226ff 100644 --- a/board/nvidia/cardhu/cardhu.c +++ b/board/nvidia/cardhu/cardhu.c @@ -33,7 +33,7 @@ void pinmux_init(void) pinmux_config_drvgrp_table(cardhu_padctrl, ARRAY_SIZE(cardhu_padctrl)); } -#if defined(CONFIG_TEGRA_MMC) +#if defined(CONFIG_MMC_SDHCI_TEGRA) /* * Do I2C/PMU writes to bring up SD card bus power * diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c index e4c4bfbc680..cb9282e2923 100644 --- a/board/nvidia/dalmore/dalmore.c +++ b/board/nvidia/dalmore/dalmore.c @@ -34,7 +34,7 @@ void pinmux_init(void) ARRAY_SIZE(dalmore_padctrl)); } -#if defined(CONFIG_TEGRA_MMC) +#if defined(CONFIG_MMC_SDHCI_TEGRA) /* * Do I2C/PMU writes to bring up SD card bus power * diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c index c892a25751f..2945785ed17 100644 --- a/board/nvidia/harmony/harmony.c +++ b/board/nvidia/harmony/harmony.c @@ -14,7 +14,7 @@ #include <asm/arch/tegra.h> #include <asm/gpio.h> -#ifdef CONFIG_TEGRA_MMC +#ifdef CONFIG_MMC_SDHCI_TEGRA /* * Routine: pin_mux_mmc * Description: setup the pin muxes/tristate values for the SDMMC(s) diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 4e01deb02fb..b56bc529d1a 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -25,7 +25,7 @@ void gpio_early_init_uart(void) } #endif -#ifdef CONFIG_TEGRA_MMC +#ifdef CONFIG_MMC_SDHCI_TEGRA /* * Routine: pin_mux_mmc * Description: setup the pin muxes/tristate values for the SDMMC(s) diff --git a/board/nvidia/whistler/whistler.c b/board/nvidia/whistler/whistler.c index 3476f1159fe..db489780612 100644 --- a/board/nvidia/whistler/whistler.c +++ b/board/nvidia/whistler/whistler.c @@ -15,7 +15,7 @@ #include <asm/gpio.h> #include <i2c.h> -#ifdef CONFIG_TEGRA_MMC +#ifdef CONFIG_MMC_SDHCI_TEGRA /* * Routine: pin_mux_mmc * Description: setup the pin muxes/tristate values for the SDMMC(s) |