diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-12-07 22:10:26 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-29 13:08:07 -0500 |
| commit | c27269953b94d19b3fc7a21a1c3e19985507b94d (patch) | |
| tree | 6824ca3c92ed9da414da26e7ff1618201cd5a54b /include/configs | |
| parent | 187809517da0f488f6f2069543783cf2923abb23 (diff) | |
mmc: complete unfinished move of CONFIG_MMC
Commit 7a777f6d6f35 ("mmc: Add generic Kconfig option") created
a Kconfig entry for this option without any actual moves, then
commit 44c798799f66 ("sunxi: Use Kconfig CONFIG_MMC") moved
instances only for SUNXI.
We generally do not like such partial moves. This kind of work
is automated by tools/moveconfig.py, so it is pretty easy to
complete this move.
I am adding "default ARM || PPC || SANDBOX" (suggested by Tom).
This shortens the configs and will ease new board porting.
This commit was created as follows:
[1] Edit Kconfig (remove the "depends on", add the "default",
copy the prompt and help message from Linux)
[2] Run 'tools/moveconfig.py -y -s -r HEAD MMC'
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Diffstat (limited to 'include/configs')
180 files changed, 0 insertions, 197 deletions
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 5cfdbb26cb..6663a923ef 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -482,7 +482,6 @@ combinations. this should be removed later #endif /* CONFIG_TSEC_ENET */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 6335c553c1..753ce1353c 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -21,8 +21,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_MMC 1 - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index adc3193c4f..f86b008879 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -483,8 +483,6 @@ extern int board_pci_host_broken(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ -#define CONFIG_MMC 1 - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 48e06af22a..d843bd1a75 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -495,8 +495,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ -#define CONFIG_MMC 1 - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index d8f7961ded..b17a6c570d 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -609,8 +609,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ -#define CONFIG_MMC 1 - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index bd520543ef..bd15645934 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -466,8 +466,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ -#define CONFIG_MMC 1 - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 78e006492d..4d0ae9d8b0 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -673,7 +673,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LBA48 #endif /* #ifdef CONFIG_FSL_SATA */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 81e8c29c28..169f94a366 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -508,7 +508,6 @@ #define CONFIG_DOS_PARTITION #endif -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 91e5f8b901..7a3fa03c3d 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -609,8 +609,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index 52ef4321d6..e32cddec59 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -10,7 +10,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index 65ec8f704d..a6fa6a8e26 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -10,7 +10,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_MMC #define CONFIG_PCIE3 #define CONFIG_CMD_SATA diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index 17e941e4e7..0a8c38767f 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -10,7 +10,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 diff --git a/include/configs/P5040DS.h b/include/configs/P5040DS.h index 078e60c4c2..5933fc0860 100644 --- a/include/configs/P5040DS.h +++ b/include/configs/P5040DS.h @@ -10,7 +10,6 @@ */ #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ -#define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC #define CONFIG_PCIE3 #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index fda83d2c20..303c73bf1b 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -662,7 +662,6 @@ unsigned long get_board_ddr_clk(void); /* * SDHC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 054b323663..e451851549 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -664,7 +664,6 @@ unsigned long get_board_ddr_clk(void); /* * SDHC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 00676ddf50..7779c3189a 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -551,8 +551,6 @@ unsigned long get_board_ddr_clk(void); #endif #endif -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 7521dd02f8..41cb43cfa1 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -661,8 +661,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #endif -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b984fcd96e..878dbed1a1 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -12,7 +12,6 @@ #define __T208xQDS_H #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_MMC #define CONFIG_USB_EHCI #if defined(CONFIG_ARCH_T2080) #define CONFIG_T2080QDS diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index e013e725a8..ee27a8fb34 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -13,7 +13,6 @@ #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_MMC #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index d90fb35ab7..78ad86c4a6 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -516,8 +516,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index fd5dbc54a4..5b3c6fa9d6 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -703,8 +703,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index c194ec7815..0775603b9e 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -45,7 +45,6 @@ #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_MMC #define CONFIG_SYS_L2_SIZE (256 << 10) #define CONFIG_LAST_STAGE_INIT @@ -81,7 +80,6 @@ #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_MMC #define CONFIG_SYS_L2_SIZE (256 << 10) #define CONFIG_LAST_STAGE_INIT diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 5cb79f1524..93fa6149b0 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -100,7 +100,6 @@ /* * SD (MMC) controller */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION #define CONFIG_FTSDC010 diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 3626636ad4..99f9ef757f 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -55,7 +55,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_DOS_PARTITION diff --git a/include/configs/alt.h b/include/configs/alt.h index 7d6ec7814b..726e6d6cc1 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -87,7 +87,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* MMCIF */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_MMCIF diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 07ef9e98e9..ad0de2c817 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} #define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index ad56d240c1..3247a4af9d 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -77,7 +77,6 @@ 115200} /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d3af2da44f..fdf9ed0382 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -69,7 +69,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index f2a24c11de..12a287742c 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC support */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b903ba53d1..e9d8232814 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -308,7 +308,6 @@ * SD/MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MXC_MMC #define CONFIG_MXC_MCI_REGS_BASE 0x10014000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index e1f934ce09..f07366e653 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -146,7 +146,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index cc1695ee38..6806cc7e25 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -105,7 +105,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index fd0504d40b..12a92c2871 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -99,7 +99,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index b825464f70..9c9e809acc 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -123,7 +123,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 23184ceba0..b5aebe634a 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -106,7 +106,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_DOS_PARTITION diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 843f03a1ea..6dee45a9f2 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -111,7 +111,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index a0f451b1a0..00a8c7970f 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -86,7 +86,6 @@ #define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC -#define CONFIG_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 4d9282a7bf..d1f61b3243 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -105,7 +105,6 @@ #define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC -#define CONFIG_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 9ddfff2b2c..3d17ae1264 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -107,7 +107,6 @@ #define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC -#define CONFIG_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index b99248ec98..296fbd1264 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -85,7 +85,6 @@ /* * SD/MMC configuration */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 408c0f52d9..8a4950f2d7 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -24,7 +24,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index eb4c497c94..f822f48a50 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -34,7 +34,6 @@ #define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 7a75fdb3f4..9d06dad561 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -33,7 +33,6 @@ #define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR diff --git a/include/configs/beaver.h b/include/configs/beaver.h index ab1ab14103..2e43a097b5 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 510cd47a98..43e4971b74 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -129,7 +129,6 @@ */ #if !defined(__ADSPBF512__) #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_BFIN_SDH #endif diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 258115a69e..40ca18d2b1 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -115,7 +115,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 4f861aa432..651770524a 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -125,7 +125,6 @@ */ #define CONFIG_MMC_SPI #ifdef CONFIG_MMC_SPI -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #endif diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 9376283ffc..b79aa2bd30 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -143,7 +143,6 @@ */ #if !defined(__ADSPBF544__) #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_BFIN_SDH #endif diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 4deb2d247e..337bb0a580 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -127,7 +127,6 @@ * SDH Settings */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_BFIN_SDH /* diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index a5fdbbba3a..eb2419c315 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -48,7 +48,6 @@ /* MMC/SD IP block */ #if defined(CONFIG_EMMC_BOOT) - #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index a6369d63b8..ac338c465e 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -43,7 +43,6 @@ /* GPIO */ /* MMC/SD IP block */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 462b7841b6..b7df2bce4c 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index f3bb279b30..6eed4bc562 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index c976ec867c..e3735f7d1d 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -43,7 +43,6 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_MMC #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC #define CONFIG_SDHCI diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 78841cd749..32229d2182 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -118,7 +118,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 5785ebd334..dc2eabd3e5 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -116,7 +116,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index da5a4b3fb8..1ce27e32ba 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -81,7 +81,6 @@ 115200} #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 1e2a477027..bae9697ca7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -88,7 +88,6 @@ #define CONFIG_OMAP_GPIO #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 86ed4d243d..b05fca6828 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -67,7 +67,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 6a52869026..e9db97f1ad 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC support */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index e8b3f99f53..4d13856439 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC support */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 62131c7359..933b179be3 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -56,7 +56,6 @@ "512k(u-boot-env)," \ "-(ubi)" -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 5ef999c674..cc191480a9 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -27,7 +27,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 971549e2e7..e0290e72af 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -210,7 +210,6 @@ /* * MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 55aa03bead..f863810984 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -26,7 +26,6 @@ #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA} -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 45caf9f4d7..0307b144bd 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -13,7 +13,6 @@ #error Must call Cyrus CONFIG with a specific CPU enabled. #endif -#define CONFIG_MMC #define CONFIG_SDCARD #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 18a8e26a22..ceb9ceab5a 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -313,7 +313,6 @@ /* SD/MMC configuration */ #ifndef CONFIG_USE_NOR -#define CONFIG_MMC #define CONFIG_DAVINCI_MMC_SD1 #define CONFIG_GENERIC_MMC #define CONFIG_DAVINCI_MMC diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index b0311bf9a1..04ab48da68 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index b8c5232178..7333e481f3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -43,7 +43,6 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_MMC #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC #define CONFIG_SDHCI diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 75e1d1ce66..c11e581010 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -29,7 +29,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 1b440eaf0f..cbc6126361 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -32,7 +32,6 @@ #define COUNTER_FREQUENCY 19000000 /* This are needed to have proper mmc support */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SDHCI diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index c9e8c8ece3..d4aca55b3c 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 7053795309..a83c617d89 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -234,7 +234,6 @@ #ifdef CONFIG_EP93XX_SPI_MMC #define CONFIG_EP93XX_SPI -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI #define CONFIG_MMC_SPI_NPOWER_EGPIO 9 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index b4a0388ad5..c78eebfdef 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -127,7 +127,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_SYS_MMC_CD_PIN AT91_PIO_PORTC, 8 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 566f2464ce..2a051a98ec 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -39,7 +39,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_S5P_SDHCI #define CONFIG_SDHCI #define CONFIG_DWMMC diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 6d25035d13..b87b04df70 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -30,7 +30,6 @@ #undef CONFIG_SCSI /* SD/MMC support */ -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 2560c88456..0039c8c126 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -67,7 +67,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_DOS_PARTITION diff --git a/include/configs/gose.h b/include/configs/gose.h index 23707ed936..45395cdda6 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -94,7 +94,6 @@ #define CONFIG_SMSTP7_ENA 0x00200000 /* SDHI */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 3d6b5fcc1f..cf3c4938d6 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -27,7 +27,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_HARMONY /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 7a03d0f30a..c725833675 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -72,7 +72,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_DWMMC #define CONFIG_HIKEY_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 9677aab4b4..9f076576e5 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -24,7 +24,6 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 14c43b814c..30168bccfd 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -137,7 +137,6 @@ /* * SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MXC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 90e282feaf..c1fa2c6507 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 2da0d8dd7f..e9e69a7805 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -61,7 +61,6 @@ #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ /* MMC/SD */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 76f2b8b7b4..7a4ba09fc6 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -88,7 +88,6 @@ * MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index a1d96ff59e..c7aa7cc084 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -94,7 +94,6 @@ #define CONFIG_SMSTP7_ENA 0x00200000 /* SD */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 diff --git a/include/configs/lager.h b/include/configs/lager.h index 664999c48d..a7894ca19b 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -86,7 +86,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_MMCIF diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index f2f82acc99..3b118bb723 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -215,7 +215,6 @@ #define CONFIG_ENV_SIZE (16 << 10) /* SD/MMC configuration */ -#define CONFIG_MMC #define CONFIG_DAVINCI_MMC_SD1 #define CONFIG_GENERIC_MMC #define CONFIG_DAVINCI_MMC diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 0cc17910d3..b5b4d7eeb5 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -131,7 +131,6 @@ #endif /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 15410ddfdf..f35fd31cae 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -44,7 +44,6 @@ #define __SW_REV_B 0xF0 /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 7af4bc41dc..ae8ee2412f 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -156,7 +156,6 @@ /* * MMC */ -#define CONFIG_MMC #define CONFIG_CMD_MMC #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 128da8a352..6f857a75ad 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -393,7 +393,6 @@ unsigned long get_board_ddr_clk(void); /* * MMC */ -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 145833287e..b48cd0062b 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -294,7 +294,6 @@ /* * MMC */ -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index c1e3ec6784..3e704640ed 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -147,7 +147,6 @@ #define CONFIG_CMD_ENV /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 3887faa97b..40e6af8127 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -115,7 +115,6 @@ #define CONFIG_CMD_ENV /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index f0ec6c4d6a..07be30c48f 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 838568fd21..37d5704a72 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -355,7 +355,6 @@ unsigned long get_board_ddr_clk(void); #endif /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 31df781934..713e86b41e 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -299,7 +299,6 @@ unsigned long get_board_sys_clk(void); #endif /* MMC */ -#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 7e05bfd6b4..8ec98fd633 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -82,7 +82,6 @@ * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 91037d6cb5..de83d6c97b 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -87,7 +87,6 @@ * SD/MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0c6b1e89fc..f15abd3ac9 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -81,7 +81,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index ae7ca3b3f5..d42976b709 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 3aa22d2b52..292227114a 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -27,7 +27,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 81826eae00..3853c052d5 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -87,7 +87,6 @@ #define CONFIG_ENV_OVERWRITE /* ESDHC driver */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR IMX_MMC_SDHC1_BASE diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 3f064fd8b2..c0fb8d15b4 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -219,7 +219,6 @@ #define CONFIG_MXC_USB_PORTSC (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI) /* mmc driver */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 3c1d53fdf8..b62360bac9 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -67,8 +67,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_MMC - #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 27e7738a7b..d84d524deb 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 87c75d4e53..8fec94eda2 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC /* bootz: zImage/initrd.img support */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 7a896c7e6f..aa829287e0 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 6cc5d9c60a..6cc5f0f731 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 262a913464..ad4964c182 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index e79ec21256..3bb939ecf0 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -82,7 +82,6 @@ #define CONFIG_MXC_GPIO /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_ESDHC diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 06452288ba..4348b43247 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -60,7 +60,6 @@ #define CONFIG_MXC_UART /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_ESDHC diff --git a/include/configs/mxs.h b/include/configs/mxs.h index df0cc23e59..04c3ce9d6e 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -148,7 +148,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_MXS_MMC diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index ce74322954..99ce60f731 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -93,7 +93,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index c548ee146f..ae49054389 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 6388a9ccaf..1a67584b9f 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -47,7 +47,6 @@ */ /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 8119fb2184..cdc93c38c8 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -328,7 +328,6 @@ #endif /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DAVINCI_MMC diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 908a1af8f6..c21b849122 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -107,7 +107,6 @@ #endif /*CONFIG_MVSATA_IDE*/ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MVEBU_MMC #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index c20ef5e339..8668495d17 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -846,8 +846,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 5ff2e35036..a9b2020842 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -412,8 +412,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #endif -#define CONFIG_MMC - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 968b89e9ac..cd981b9926 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 9cf697f384..7ff545c5a2 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 4fa345d59e..7daaf8e315 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index 67a16039d1..0864e4dabc 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/paz00.h b/include/configs/paz00.h index a8bb3ffef2..0cefee398e 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -23,7 +23,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_PAZ00 /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index e70c3f01d2..3963efd1dd 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -65,7 +65,6 @@ #endif -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/pepper.h b/include/configs/pepper.h index d9c84f27ea..2aa63fcc73 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -7,7 +7,6 @@ #ifndef __CONFIG_PEPPER_H #define __CONFIG_PEPPER_H -#define CONFIG_MMC #include <configs/ti_am335x_common.h> #undef CONFIG_BOARD_LATE_INIT diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 52b7a2aad6..57b91e797b 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -92,7 +92,6 @@ * SDHC Configuration */ #define CONFIG_SDHCI -#define CONFIG_MMC #define CONFIG_GENERIC_MMC /*-------------------------------------------------- diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index a214c4d53c..2bd7076499 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -37,7 +37,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 9051c1cefc..20fb0366f3 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -92,7 +92,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 635e4397c4..8ad5af1899 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/porter.h b/include/configs/porter.h index 7d8a0950cf..ccaa796271 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -88,7 +88,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* SD */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h index 3fa77399cf..4598bd9881 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -22,7 +22,6 @@ * MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_PXA_MMC_GENERIC #define CONFIG_DOS_PARTITION diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 92be29e7bb..27dfbcef66 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -37,7 +37,6 @@ #define CONFIG_ROCKCHIP_CHIP_TAG "RK30" /* MMC/SD IP block */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 5358372587..535797a72d 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -40,7 +40,6 @@ #define CONFIG_SPL_TEXT_BASE 0xff704004 /* MMC/SD IP block */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index aa646c6f52..394ec40ca4 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ /* MMC/SD IP block */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC #define CONFIG_SDHCI diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 4406366b18..b105fc18d5 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -83,7 +83,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_MMC_SDHCI_IO_ACCESSORS #define CONFIG_BCM2835_SDHCI diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 9f85fdc11b..c55f6b9700 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -77,7 +77,6 @@ #undef CONFIG_CMD_IMLS -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 6a5425a679..c1057aa1cb 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -48,7 +48,6 @@ /* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_S5P_SDHCI #define SDHCI_MAX_HOSTS 4 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index f48559e321..b840315626 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -81,7 +81,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_ATMEL_MCI_8BIT diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index ed91bdc124..831a45c255 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -113,7 +113,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI0 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 5d78847450..bcd5c37710 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -64,7 +64,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 498b32b639..90097307bd 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -64,7 +64,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 2b6509a7a2..3ee655562c 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 67ca4a660d..e2af82dd58 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -88,7 +88,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_MMC 1 #define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index d77b4702eb..0859109603 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -88,7 +88,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_MMC 1 #define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index efb7ad951d..05b5faa81d 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -89,7 +89,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_MMC 1 #define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 748a2ea5bb..9f22d4c1c6 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -83,7 +83,6 @@ * SDIO/MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MVEBU_MMC #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 456429694e..e4d0ad9309 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/silk.h b/include/configs/silk.h index 19c6297c6e..a343cd1daa 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -88,7 +88,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* MMCIF */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SH_MMCIF #define CONFIG_SH_MMCIF_ADDR 0xee200000 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index c76c55fd5a..a19a38b25d 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -71,7 +71,6 @@ #define CONFIG_PARTITION_UUIDS /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI diff --git a/include/configs/sniper.h b/include/configs/sniper.h index e12b101333..0a3d24236f 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -95,7 +95,6 @@ * MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 58a6550844..2c40827877 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -142,7 +142,6 @@ * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC diff --git a/include/configs/stout.h b/include/configs/stout.h index e3b9325961..0d9e4aa4cb 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -92,7 +92,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC /* Module stop status bits */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 6604cecdcb..9733299148 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -24,7 +24,6 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index ff0c60d01c..44201a2546 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -73,7 +73,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index a873e7b553..03fc42c877 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -71,7 +71,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index c294f704f2..97aa046854 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -118,7 +118,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 0e9d98c2d0..067e1718db 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/tec.h b/include/configs/tec.h index 7b1429925e..c03dabf9db 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index a9990b7383..5144d5aace 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -115,9 +115,6 @@ #endif /* remove MMC support */ -#ifdef CONFIG_MMC -#undef CONFIG_MMC -#endif #ifdef CONFIG_GENERIC_MMC #undef CONFIG_GENERIC_MMC #endif diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 6a5ed196bf..86ab1e0f4a 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */ #define CONFIG_OMAP_GPIO -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 5db4c60546..d909f25fa8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -52,7 +52,6 @@ #define CONFIG_CMD_ASKEN #define CONFIG_OMAP_GPIO -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d13fc94785..dbe494a6e3 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -168,7 +168,6 @@ #endif /* MMC/SD IP block */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC /* McSPI IP block */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index cfb4b30da7..28a80f5267 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -306,7 +306,6 @@ /* We wont be loading up OS from SPL for now.. */ /* We do not have MMC support.. yet.. */ -#undef CONFIG_MMC #undef CONFIG_GENERIC_MMC /* And no support for GPIO, yet.. */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 07a92ebcf8..1c36d0751c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -89,7 +89,6 @@ /* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index cfc8451481..ff006143d6 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 2e5f38d478..9050ae42b9 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -61,8 +61,6 @@ #define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001 -#define CONFIG_MMC - #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index b2d54d53b0..904b7727a8 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -43,7 +43,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_MMC #define CONFIG_GENERIC_MMC /* USB */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 72fa9736d7..7c7b20031c 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 7a388698eb..f5459a8949 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -21,7 +21,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_VENTANA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index a8eba314e3..0bc4ea58c5 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -150,7 +150,6 @@ #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 -#define CONFIG_MMC 1 #define CONFIG_GENERIC_MMC #define CONFIG_ARM_PL180_MMCI #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 6aeb078261..20f0d6eafc 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -64,7 +64,6 @@ "-(rootfs)" #endif -#define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 0f3fc8f7d5..07fe616687 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -57,7 +57,6 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 0cd892ed73..ffd9a2c242 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_I2C_TEGRA /* SD/MMC */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 50495bfa0e..4aaeea91fe 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -60,7 +60,6 @@ #define CONFIG_RTC_MC13XXX /* mmc driver */ -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index fb4f6d6806..97de13704f 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -81,7 +81,6 @@ #define CONFIG_AUTO_COMPLETE #if defined(CONFIG_ZYNQ_SDHCI) -# define CONFIG_MMC # define CONFIG_GENERIC_MMC # define CONFIG_SUPPORT_EMMC_BOOT # define CONFIG_SDHCI diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 97dfc0e6ec..a30aefbae8 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -62,7 +62,6 @@ * MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_PXA_MMC_GENERIC #define CONFIG_SYS_MMC_BASE 0xF0000000 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 953e7311a6..01e2fca020 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -85,7 +85,6 @@ /* MMC */ #if defined(CONFIG_ZYNQ_SDHCI) -# define CONFIG_MMC # define CONFIG_GENERIC_MMC # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 |