[U-Boot] [PATCH 6/7] mmc: move more driver config options to Kconfig

Simon Glass sjg at chromium.org
Fri Jan 13 03:19:24 CET 2017


On 1 January 2017 at 05:11, Masahiro Yamada
<yamada.masahiro at socionext.com> wrote:
> 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 at socionext.com>
> ---
>
>  arch/arm/cpu/arm926ejs/mx27/generic.c      |  8 ++---
>  arch/arm/include/asm/arch-mx27/imx-regs.h  |  4 +--
>  arch/arm/mach-davinci/da830_pinmux.c       |  2 +-
>  arch/arm/mach-omap2/am33xx/board.c         |  2 +-
>  arch/arm/mach-tegra/board2.c               |  2 +-
>  board/armadeus/apf27/apf27.c               |  2 +-
>  board/avionic-design/common/tamonten.c     |  2 +-
>  board/compal/paz00/paz00.c                 |  2 +-
>  board/davinci/da8xxevm/da850evm.c          | 12 +++----
>  board/davinci/da8xxevm/omapl138_lcdk.c     | 10 +++---
>  board/htkw/mcx/mcx.c                       |  2 +-
>  board/lego/ev3/legoev3.c                   |  4 +--
>  board/nvidia/cardhu/cardhu.c               |  2 +-
>  board/nvidia/dalmore/dalmore.c             |  2 +-
>  board/nvidia/harmony/harmony.c             |  2 +-
>  board/nvidia/seaboard/seaboard.c           |  2 +-
>  board/nvidia/whistler/whistler.c           |  2 +-
>  board/technexion/twister/twister.c         |  2 +-
>  board/teejet/mt_ventoux/mt_ventoux.c       |  2 +-
>  board/toradex/colibri_t20/colibri_t20.c    |  2 +-
>  configs/am335x_baltos_defconfig            |  1 +
>  configs/am335x_boneblack_defconfig         |  1 +
>  configs/am335x_boneblack_vboot_defconfig   |  1 +
>  configs/am335x_evm_defconfig               |  1 +
>  configs/am335x_evm_nor_defconfig           |  1 +
>  configs/am335x_evm_norboot_defconfig       |  1 +
>  configs/am335x_evm_spiboot_defconfig       |  1 +
>  configs/am335x_evm_usbspl_defconfig        |  1 +
>  configs/am335x_igep0033_defconfig          |  1 +
>  configs/am335x_shc_defconfig               |  1 +
>  configs/am335x_shc_ict_defconfig           |  1 +
>  configs/am335x_shc_netboot_defconfig       |  1 +
>  configs/am335x_shc_prompt_defconfig        |  1 +
>  configs/am335x_shc_sdboot_defconfig        |  1 +
>  configs/am335x_shc_sdboot_prompt_defconfig |  1 +
>  configs/am335x_sl50_defconfig              |  1 +
>  configs/am3517_crane_defconfig             |  1 +
>  configs/am3517_evm_defconfig               |  1 +
>  configs/am43xx_evm_defconfig               |  1 +
>  configs/am43xx_evm_ethboot_defconfig       |  1 +
>  configs/am43xx_evm_qspiboot_defconfig      |  1 +
>  configs/am43xx_evm_usbhost_boot_defconfig  |  1 +
>  configs/am43xx_hs_evm_defconfig            |  1 +
>  configs/am57xx_evm_defconfig               |  1 +
>  configs/am57xx_evm_nodt_defconfig          |  1 +
>  configs/am57xx_hs_evm_defconfig            |  1 +
>  configs/apf27_defconfig                    |  1 +
>  configs/apx4devkit_defconfig               |  1 +
>  configs/birdland_bav335a_defconfig         |  1 +
>  configs/birdland_bav335b_defconfig         |  1 +
>  configs/brppt1_mmc_defconfig               |  1 +
>  configs/brppt1_spi_defconfig               |  1 +
>  configs/brxre1_defconfig                   |  1 +
>  configs/cairo_defconfig                    |  1 +
>  configs/cm_t335_defconfig                  |  1 +
>  configs/cm_t3517_defconfig                 |  1 +
>  configs/cm_t35_defconfig                   |  1 +
>  configs/cm_t43_defconfig                   |  1 +
>  configs/cm_t54_defconfig                   |  1 +
>  configs/devkit8000_defconfig               |  1 +
>  configs/dra7xx_evm_defconfig               |  1 +
>  configs/dra7xx_hs_evm_defconfig            |  1 +
>  configs/draco_defconfig                    |  1 +
>  configs/duovero_defconfig                  |  1 +
>  configs/eco5pk_defconfig                   |  1 +
>  configs/etamin_defconfig                   |  1 +
>  configs/igep0020_defconfig                 |  1 +
>  configs/igep0030_defconfig                 |  1 +
>  configs/igep0032_defconfig                 |  1 +
>  configs/k2g_evm_defconfig                  |  1 +
>  configs/kc1_defconfig                      |  1 +
>  configs/m28evk_defconfig                   |  1 +
>  configs/mcx_defconfig                      |  1 +
>  configs/mt_ventoux_defconfig               |  1 +
>  configs/mx23_olinuxino_defconfig           |  1 +
>  configs/mx23evk_defconfig                  |  1 +
>  configs/mx28evk_auart_console_defconfig    |  1 +
>  configs/mx28evk_defconfig                  |  1 +
>  configs/mx28evk_nand_defconfig             |  1 +
>  configs/mx28evk_spi_defconfig              |  1 +
>  configs/nokia_rx51_defconfig               |  1 +
>  configs/omap3_beagle_defconfig             |  1 +
>  configs/omap3_evm_defconfig                |  1 +
>  configs/omap3_ha_defconfig                 |  1 +
>  configs/omap3_logic_defconfig              |  1 +
>  configs/omap3_overo_defconfig              |  1 +
>  configs/omap3_pandora_defconfig            |  1 +
>  configs/omap3_zoom1_defconfig              |  1 +
>  configs/omap4_panda_defconfig              |  1 +
>  configs/omap4_sdp4430_defconfig            |  1 +
>  configs/omap5_uevm_defconfig               |  1 +
>  configs/pcm051_rev1_defconfig              |  1 +
>  configs/pcm051_rev3_defconfig              |  1 +
>  configs/pengwyn_defconfig                  |  1 +
>  configs/pepper_defconfig                   |  1 +
>  configs/pxm2_defconfig                     |  1 +
>  configs/rastaban_defconfig                 |  1 +
>  configs/rut_defconfig                      |  1 +
>  configs/sansa_fuze_plus_defconfig          |  1 +
>  configs/sc_sps_1_defconfig                 |  1 +
>  configs/sniper_defconfig                   |  1 +
>  configs/tao3530_defconfig                  |  1 +
>  configs/thuban_defconfig                   |  1 +
>  configs/ti814x_evm_defconfig               |  1 +
>  configs/ti816x_evm_defconfig               |  1 +
>  configs/tricorder_defconfig                |  1 +
>  configs/tricorder_flash_defconfig          |  1 +
>  configs/ts4600_defconfig                   |  1 +
>  configs/twister_defconfig                  |  1 +
>  configs/xfi3_defconfig                     |  1 +
>  drivers/mmc/Kconfig                        | 53 ++++++++++++++++++++++++++++++
>  drivers/mmc/Makefile                       | 16 +++++----
>  include/configs/am3517_crane.h             |  1 -
>  include/configs/am3517_evm.h               |  1 -
>  include/configs/apalis_t30.h               |  1 -
>  include/configs/apf27.h                    |  1 -
>  include/configs/beaver.h                   |  1 -
>  include/configs/brppt1.h                   |  1 -
>  include/configs/brxre1.h                   |  1 -
>  include/configs/cardhu.h                   |  1 -
>  include/configs/cei-tk1-som.h              |  1 -
>  include/configs/cm_t35.h                   |  1 -
>  include/configs/cm_t3517.h                 |  1 -
>  include/configs/colibri_t20.h              |  1 -
>  include/configs/colibri_t30.h              |  1 -
>  include/configs/da850evm.h                 |  1 -
>  include/configs/dalmore.h                  |  1 -
>  include/configs/e2220-1170.h               |  1 -
>  include/configs/harmony.h                  |  1 -
>  include/configs/imx27lite-common.h         |  1 -
>  include/configs/jetson-tk1.h               |  1 -
>  include/configs/k2g_evm.h                  |  1 -
>  include/configs/kc1.h                      |  1 -
>  include/configs/legoev3.h                  |  1 -
>  include/configs/mcx.h                      |  1 -
>  include/configs/medcom-wide.h              |  1 -
>  include/configs/mxs.h                      |  1 -
>  include/configs/nokia_rx51.h               |  1 -
>  include/configs/nyan-big.h                 |  1 -
>  include/configs/omap3_evm.h                |  1 -
>  include/configs/omapl138_lcdk.h            |  1 -
>  include/configs/p2371-0000.h               |  1 -
>  include/configs/p2371-2180.h               |  1 -
>  include/configs/p2571.h                    |  1 -
>  include/configs/p2771-0000.h               |  1 -
>  include/configs/paz00.h                    |  1 -
>  include/configs/plutux.h                   |  1 -
>  include/configs/seaboard.h                 |  1 -
>  include/configs/siemens-am33x-common.h     |  1 -
>  include/configs/sniper.h                   |  1 -
>  include/configs/sunxi-common.h             |  1 -
>  include/configs/tam3517-common.h           |  1 -
>  include/configs/tao3530.h                  |  1 -
>  include/configs/tec-ng.h                   |  1 -
>  include/configs/tec.h                      |  1 -
>  include/configs/tegra-common-post.h        |  3 --
>  include/configs/ti814x_evm.h               |  1 -
>  include/configs/ti816x_evm.h               |  1 -
>  include/configs/ti_armv7_omap.h            |  3 --
>  include/configs/tricorder.h                |  1 -
>  include/configs/trimslice.h                |  1 -
>  include/configs/venice2.h                  |  1 -
>  include/configs/ventana.h                  |  1 -
>  include/configs/whistler.h                 |  1 -
>  164 files changed, 186 insertions(+), 97 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>


More information about the U-Boot mailing list