[U-Boot] [PATCH 3/7] mmc: zynq: rename CONFIG_ZYNQ_SDHCI to CONFIG_MMC_SDHCI_ZYNQ
Jaehoon Chung
jh80.chung at samsung.com
Tue Jan 31 13:53:32 CET 2017
On 01/30/2017 07:46 PM, Masahiro Yamada wrote:
> Make the naming scheme consistent; all SDHCI-base drivers prefixed
> with CONFIG_MMC_SDHCI_.
>
> While we are here, add "depends on ARCH_ZYNQ || ARCH_ZYNQMP".
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
Applied on u-boot-mmc. Thanks!
Best Regards,
Jaehoon Chung
> ---
>
> Changes in v2: None
>
> arch/arm/mach-zynq/Kconfig | 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 +-
> drivers/mmc/Kconfig | 15 ++++++++-------
> drivers/mmc/Makefile | 2 +-
> include/configs/xilinx_zynqmp.h | 10 +++++-----
> include/configs/zynq-common.h | 8 ++++----
> 20 files changed, 34 insertions(+), 33 deletions(-)
>
> diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
> index c465918..2529c9f 100644
> --- a/arch/arm/mach-zynq/Kconfig
> +++ b/arch/arm/mach-zynq/Kconfig
> @@ -13,7 +13,7 @@ config SPL_LIBGENERIC_SUPPORT
> default y
>
> config SPL_MMC_SUPPORT
> - default y if ZYNQ_SDHCI
> + default y if MMC_SDHCI_ZYNQ
>
> config SPL_SERIAL_SUPPORT
> default y
> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
> index 3239d99..a822ee1 100644
> --- a/configs/topic_miami_defconfig
> +++ b/configs/topic_miami_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_EMBED=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
> index 906220c..9b4e82d 100644
> --- a/configs/topic_miamiplus_defconfig
> +++ b/configs/topic_miamiplus_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_EMBED=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
> index 1d12440..49c0786 100644
> --- a/configs/xilinx_zynqmp_ep_defconfig
> +++ b/configs/xilinx_zynqmp_ep_defconfig
> @@ -53,7 +53,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_CADENCE=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_NAND_ARASAN=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> index 4d90fc3..a3585d0 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> @@ -43,7 +43,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_CADENCE=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> index 817d066..a4c73f8 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> @@ -35,7 +35,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_CADENCE=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_DM_ETH=y
> CONFIG_ZYNQ_GEM=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> index 9d15846..f981b21 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> @@ -35,7 +35,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_CADENCE=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_DM_ETH=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
> index f6bbf83..7b65fe0 100644
> --- a/configs/xilinx_zynqmp_zcu102_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_defconfig
> @@ -43,7 +43,7 @@ CONFIG_FPGA_XILINX=y
> CONFIG_FPGA_ZYNQMPPL=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> index 43ad2d9..4bed589 100644
> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> @@ -43,7 +43,7 @@ CONFIG_FPGA_XILINX=y
> CONFIG_FPGA_ZYNQMPPL=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index c84421c..8d941ab 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -33,7 +33,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
> index 529a9ad..fb9356c 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -29,7 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_ZYNQ_GEM=y
> CONFIG_USB=y
> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
> index f71d515..159d9d5 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -35,7 +35,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 01b951e..2e43b1b 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -35,7 +35,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
> index 62ce4ba..fd59b68 100644
> --- a/configs/zynq_zc770_xm010_defconfig
> +++ b/configs/zynq_zc770_xm010_defconfig
> @@ -30,7 +30,7 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index 0a6e7ba..3fff495 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -33,7 +33,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 5a428a8..0988350 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -35,7 +35,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> -CONFIG_ZYNQ_SDHCI=y
> +CONFIG_MMC_SDHCI_ZYNQ=y
> CONFIG_MMC_SDHCI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 97d245e..1d15cdd 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -165,13 +165,6 @@ config PIC32_SDHCI
> help
> Support for Microchip PIC32 SDHCI controller.
>
> -config ZYNQ_SDHCI
> - bool "Arasan SDHCI controller support"
> - depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
> - depends on MMC_SDHCI
> - help
> - Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
> -
> config ROCKCHIP_SDHCI
> bool "Arasan SDHCI controller for Rockchip support"
> depends on DM_MMC && BLK && DM_MMC_OPS
> @@ -313,6 +306,14 @@ config MMC_SDHCI_TEGRA
>
> If unsure, say N.
>
> +config MMC_SDHCI_ZYNQ
> + bool "Arasan SDHCI controller support"
> + depends on ARCH_ZYNQ || ARCH_ZYNQMP
> + depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
> + depends on MMC_SDHCI
> + help
> + Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
> +
> config MMC_SUNXI
> bool "Allwinner sunxi SD/MMC Host Controller support"
> depends on ARCH_SUNXI && !UART0_PORT_F
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
> index 2747deb..5a497f5 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -43,7 +43,6 @@ obj-$(CONFIG_S3C_SDI) += s3c_sdi.o
> obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o
> obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
> obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
> -obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o
> obj-$(CONFIG_ROCKCHIP_SDHCI) += rockchip_sdhci.o
>
> ifdef CONFIG_SPL_BUILD
> @@ -65,6 +64,7 @@ obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o
> obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o
> obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o
> obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o
> +obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o
>
> obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
> obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index 7251ae1..4759373 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -75,7 +75,7 @@
> #endif
> #define CONFIG_AUTO_COMPLETE
>
> -#if defined(CONFIG_ZYNQ_SDHCI)
> +#if defined(CONFIG_MMC_SDHCI_ZYNQ)
> # define CONFIG_SUPPORT_EMMC_BOOT
> # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
> # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000
> @@ -86,7 +86,7 @@
> # define FAT_ENV_INTERFACE "mmc"
> #endif
>
> -#if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQMP_USB)
> +#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQMP_USB)
> # define CONFIG_FAT_WRITE
> #endif
>
> @@ -128,7 +128,7 @@
> # define CONFIG_FASTBOOT_BUF_ADDR 0x100000
> # define CONFIG_FASTBOOT_BUF_SIZE 0x6000000
> # define CONFIG_FASTBOOT_FLASH
> -# ifdef CONFIG_ZYNQ_SDHCI
> +# ifdef CONFIG_MMC_SDHCI_ZYNQ
> # define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
> # endif
>
> @@ -221,7 +221,7 @@
> "scriptaddr=0x02000000\0" \
> "ramdisk_addr_r=0x02100000\0" \
>
> -#if defined(CONFIG_ZYNQ_SDHCI)
> +#if defined(CONFIG_MMC_SDHCI_ZYNQ)
> # define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
> #else
> # define BOOT_TARGET_DEVICES_MMC(func)
> @@ -289,7 +289,7 @@
> #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000
>
> /* MMC support */
> -#ifdef CONFIG_ZYNQ_SDHCI
> +#ifdef CONFIG_MMC_SDHCI_ZYNQ
> # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
> # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
> # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index e2c70a0..8e9d3c4 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -83,7 +83,7 @@
> #endif
>
> /* MMC */
> -#if defined(CONFIG_ZYNQ_SDHCI)
> +#if defined(CONFIG_MMC_SDHCI_ZYNQ)
> # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000
> #endif
>
> @@ -105,7 +105,7 @@
> "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
> "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
>
> -# if defined(CONFIG_ZYNQ_SDHCI)
> +# if defined(CONFIG_MMC_SDHCI_ZYNQ)
> # define DFU_ALT_INFO_MMC \
> "dfu_mmc_info=" \
> "set dfu_alt_info " \
> @@ -128,7 +128,7 @@
> # define DFU_ALT_INFO
> #endif
>
> -#if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB)
> +#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQ_USB)
> # define CONFIG_SUPPORT_VFAT
> # define CONFIG_FAT_WRITE
> #endif
> @@ -291,7 +291,7 @@
> #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"
>
> /* MMC support */
> -#ifdef CONFIG_ZYNQ_SDHCI
> +#ifdef CONFIG_MMC_SDHCI_ZYNQ
> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
> #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
> #endif
>
More information about the U-Boot
mailing list