Dear Tom,

Could you pull these patches on your master branch? I have tested a buildman with all case.

The following changes since commit 794c6e2c96c20f8fc62890a5e13cc71ab99a2e57:

Prepare v2017.03-rc1 (2017-01-30 19:05:43 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-mmc.git master

for you to fetch changes up to dd3b64eb56dae10016bd314e59a650da511c1a4e:

mmc: atmel: rename CONFIG_ATMEL_SDHCI to CONFIG_MMC_SDHCI_ATMEL (2017-01-31 21:50:47 +0900)

---------------------------------------------------------------- Masahiro Yamada (7): mmc: move CONFIG_GENERIC_MMC to Kconfig mmc: sandbox: rename CONFIG, fix dependency, and use it in Makefile mmc: zynq: rename CONFIG_ZYNQ_SDHCI to CONFIG_MMC_SDHCI_ZYNQ mmc: rockchip: rename CONFIG_ROCKCHIP_SDHCI to CONFIG_MMC_SDHCI_ROCKCHIP mmc: msm: rename CONFIG_MSM_SDHCI to CONFIG_MMC_SDHCI_MSM mmc: pic32: rename CONFIG_PIC32_SDHCI to CONFIG_MMC_SDHCI_PIC32 mmc: atmel: rename CONFIG_ATMEL_SDHCI to CONFIG_MMC_SDHCI_ATMEL

README | 3 - arch/arm/mach-zynq/Kconfig | 2 +- configs/blanche_defconfig | 3 +- configs/dragonboard410c_defconfig | 2 +- configs/evb-rk3399_defconfig | 2 +- configs/pic32mzdask_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 2 +- configs/sama5d2_xplained_spiflash_defconfig | 2 +- configs/sandbox_defconfig | 2 +- configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 2 +- configs/topic_miami_defconfig | 2 +- configs/topic_miamiplus_defconfig | 2 +- configs/xilinx_zynqmp_ep_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- doc/README.atmel_mci | 2 - doc/README.socfpga | 3 - drivers/mmc/Kconfig | 96 +++++++++++++----------- drivers/mmc/Makefile | 16 ++-- include/configs/BSC9132QDS.h | 1 - include/configs/MPC8308RDB.h | 2 - include/configs/MPC837XEMDS.h | 1 - include/configs/MPC837XERDB.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/adp-ag101p.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/alt.h | 2 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 3 - include/configs/apalis_imx6.h | 1 - include/configs/apalis_t30.h | 3 - include/configs/apf27.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/axs10x.h | 5 -- include/configs/bayleybay.h | 2 - include/configs/bcm23550_w1d.h | 2 - include/configs/bcm28155_ap.h | 2 - include/configs/beaver.h | 3 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf537-stamp.h | 3 - include/configs/bf548-ezkit.h | 1 - include/configs/bf609-ezkit.h | 1 - include/configs/blanche.h | 2 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 3 - include/configs/cei-tk1-som.h | 3 - include/configs/clearfog.h | 1 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm_t35.h | 2 - include/configs/cm_t3517.h | 2 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_t20.h | 3 - include/configs/colibri_t30.h | 3 - include/configs/colibri_vf.h | 2 - include/configs/conga-qeval20-qa3-e3845.h | 2 - include/configs/controlcenterd.h | 2 - include/configs/corenet_ds.h | 1 - include/configs/crownbay.h | 2 - include/configs/cyrus.h | 1 - include/configs/da850evm.h | 5 -- include/configs/dalmore.h | 3 - include/configs/db-88f6820-gp.h | 1 - include/configs/dfi-bt700.h | 2 - include/configs/dragonboard410c.h | 3 - include/configs/e2220-1170.h | 3 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 1 - include/configs/galileo.h | 3 - include/configs/ge_bx50v3.h | 1 - include/configs/gose.h | 1 - include/configs/harmony.h | 3 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 2 - include/configs/imx27lite-common.h | 5 -- include/configs/jetson-tk1.h | 3 - include/configs/k2g_evm.h | 3 - include/configs/kc1.h | 6 -- include/configs/koelsch.h | 1 - include/configs/lager.h | 2 - include/configs/legoev3.h | 3 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 3 - include/configs/minnowmax.h | 2 - include/configs/mvebu_armada-8k.h | 3 - include/configs/mvebu_db-88f3720.h | 3 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 - include/configs/mx53ard.h | 2 - include/configs/mx53cx9020.h | 2 - include/configs/mx53evk.h | 2 - include/configs/mx53loco.h | 2 - include/configs/mx53smd.h | 2 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 3 - include/configs/omap3_evm.h | 3 - include/configs/omapl138_lcdk.h | 2 - include/configs/openrd.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/p2371-0000.h | 3 - include/configs/p2371-2180.h | 3 - include/configs/p2571.h | 3 - include/configs/p2771-0000.h | 3 - include/configs/paz00.h | 3 - include/configs/pcm052.h | 2 - include/configs/pic32mzdask.h | 5 -- include/configs/pico-imx6ul.h | 2 - include/configs/picosam9g45.h | 1 - include/configs/plutux.h | 3 - include/configs/porter.h | 1 - include/configs/pxa-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rpi.h | 3 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sama5d2_xplained.h | 5 -- include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/sandbox.h | 2 - include/configs/seaboard.h | 3 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 2 - include/configs/silk.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 6 -- include/configs/socfpga_common.h | 1 - include/configs/stout.h | 3 - include/configs/strider.h | 2 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 2 - include/configs/tao3530.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/tec-ng.h | 3 - include/configs/tec.h | 3 - include/configs/tegra-common-post.h | 7 -- include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 3 - include/configs/ti_armv7_keystone2.h | 7 -- include/configs/tricorder.h | 3 - include/configs/trimslice.h | 3 - include/configs/ts4800.h | 2 - include/configs/uniphier.h | 1 - include/configs/usbarmory.h | 1 - include/configs/venice2.h | 3 - include/configs/ventana.h | 3 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 2 - include/configs/vinco.h | 1 - include/configs/whistler.h | 3 - include/configs/woodburn_common.h | 1 - include/configs/xilinx_zynqmp.h | 11 ++- include/configs/zipitz2.h | 1 - include/configs/zynq-common.h | 9 +-- scripts/config_whitelist.txt | 1 - 213 files changed, 93 insertions(+), 427 deletions(-)