diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-30 19:46:51 +0900 |
---|---|---|
committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-01-31 21:50:47 +0900 |
commit | 08aa0334c6e885491c6d10fa4a8209b8917fbf63 (patch) | |
tree | 0e48c7716438670a9d16bec127598868ba265446 /include/configs | |
parent | a5995a5d7b793f74c7c893b752b51cc635a621db (diff) | |
download | u-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.zip u-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.tar.gz u-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.tar.bz2 |
mmc: zynq: rename CONFIG_ZYNQ_SDHCI to CONFIG_MMC_SDHCI_ZYNQ
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@socionext.com>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/xilinx_zynqmp.h | 10 | ||||
-rw-r--r-- | include/configs/zynq-common.h | 8 |
2 files changed, 9 insertions, 9 deletions
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 |