mmc: move CONFIG_GENERIC_MMC to Kconfig

Now, CONFIG_GENERIC_MMC seems equivalent to CONFIG_MMC.

Let's create an entry for "config GENERIC_MMC" with "default MMC",
then convert all macro defines in headers to Kconfig.  Almost all
of the defines will go away.

I see only two exceptions:
  configs/blanche_defconfig
  configs/sandbox_noblk_defconfig

They define CONFIG_GENERIC_MMC, but not CONFIG_MMC.  Something
might be wrong with these two boards, so should be checked later.

Anyway, this is the output of the moveconfig tool.

This commit was created as follows:

[1] create a config entry in drivers/mmc/Kconfig

[2] tools/moveconfig.py -r HEAD GENERIC_MMC

[3] manual clean-up of garbage comments in doc/README.* and
    include/configs/*.h

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index a95348a876b4a53609ca5e384df5cc49abc61ac2..9c992c1ea3288ffdeb95a1322494955df6c82c33 100644 (file)
--- a/README
+++ b/README
@@ -1457,9 +1457,6 @@ The following options need to be configured:
                        CONFIG_SH_MMCIF_CLK
                        Define the clock frequency for MMCIF
 
-               CONFIG_GENERIC_MMC
-               Enable the generic MMC driver
-
                CONFIG_SUPPORT_EMMC_BOOT
                Enable some additional features of the eMMC boot partitions.
 

diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index 8dcbdd27ec80984bd3c231ac43279a8f21a45558..d66276457fc5bb345baac6f6fcf94ee429539481 100644 (file)
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_BLANCHE=y
-# CONFIG_MMC is not set
 CONFIG_BOOTSTAGE_USER_COUNT=0x20
 CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
@@ -19,6 +18,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+# CONFIG_MMC is not set
+CONFIG_GENERIC_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 6dc2591c08aaf7c7eecd1693b99b48c834ac6a3e..10e12bf50ea32f71ed30cc47f505d09f799d6179 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -100,6 +100,7 @@ CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
 CONFIG_SPL_PWRSEQ=y
 # CONFIG_MMC is not set
+CONFIG_GENERIC_MMC=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/doc/README.atmel_mci b/doc/README.atmel_mci
index 1ec4465ca0843caae09670a7b209a1ea9a947687..6043dabff791cbfbd7f20a31814f6c13f4d1bcaa 100644 (file)
--- a/doc/README.atmel_mci
+++ b/doc/README.atmel_mci
@@ -69,8 +69,6 @@ int board_mmc_getcd(struct mmc *mmc)
 and the board definition files needs:
 
 /* SD/MMC card */
-#define CONFIG_MMC                     1
-#define CONFIG_GENERIC_MMC             1
 #define CONFIG_GENERIC_ATMEL_MCI       1
 #define CONFIG_ATMEL_MCI_PORTB         1       /* Atmel XE-EK uses port B */
 #define CONFIG_SYS_MMC_CD_PIN          AT91_PIN_PC9

diff --git a/doc/README.socfpga b/doc/README.socfpga
index e717637ac9369d5e5d7cd20dec3dd3decb50f942..cb805cfd3a0fdcaa7565a02339a48ab0cb569175 100644 (file)
--- a/doc/README.socfpga
+++ b/doc/README.socfpga
@@ -14,8 +14,5 @@ socfpga_dw_mmc
 Here are macro and detailed configuration required to enable DesignWare SDMMC
 controller support within SOCFPGA
 
-#define CONFIG_GENERIC_MMC
--> Enable the generic MMC driver
-
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   256
 -> Using smaller max blk cnt to avoid flooding the limited stack in OCRAM

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 147e52d33225f9416a70da14fbfb8a6071caee03..df4913ba7c6b7b517272ccd3bf1f243d48643b8a 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -10,6 +10,10 @@ config MMC
          If you want MMC/SD/SDIO support, you should say Y here and
          also to your specific host controller driver.
 
+config GENERIC_MMC
+       bool "Generic MMC driver framework"
+       default MMC
+
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
        depends on DM

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index f336f28566b387e33835b73dc80c7562954ee4fd..9e729fd2f74b72d9e89c6b92ad71cf807e5d8aef 100644 (file)
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -478,7 +478,6 @@ combinations. this should be removed later
 
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif
 

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index f833450c87d4ef5c735c9a3fc8ed063f7b3cefec..4dbc2ba772620b6b341c56424308621d65b4d397 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -25,8 +25,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_USE_PIO
-
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 62d56ca726c81e68b36b0eb9768d1e9feccefdd9..4239f779a212f94487acb2fa12f64454941eccfd 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -485,7 +485,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 67ed648d24892058454cc85e90c002f19736696c..370e381f9877f278654199f716cf53292ca77997 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -497,7 +497,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index bc703ceaf63acbba078d8d078ba28dc437edcd6a..4635cdfcde0610c863b4f0e2ea5ee14b2a0d36ea 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -603,7 +603,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 2b0d98b96df636d61d15d39f8e780d646564a0cd..caa52bec00dd6dce59eb158ed4a1dbeb595aab69 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -463,7 +463,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 1d01e7fb8d44adcf6901cba89fa286fa529605d0..baa83698c50ab3bfa5dcc1be69c1c55892af4ebf 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -669,7 +669,6 @@ extern unsigned long get_sdram_size(void);
 
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif
 

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 89eec12b7e59435ecc2d31709f3ed5dc504e2387..f1d8116fb258f0b0fdcbc0f5075f8c990164a374 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -504,7 +504,6 @@
 
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif
 

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index f58fda1f3e84afea399ecfcaa8c1bc53572871f6..15384f1e87981dbfe000cbc8fce70e5433bab332 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -606,7 +606,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Hash command with SHA acceleration supported in hardware */

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 2c3b6603b1bfef8039a4a73b7b3409c993d1305f..00ffb8353900192b0423059213aeff7c22e24377 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -654,7 +654,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Qman/Bman */

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 79c34ef35d711c85b6fe242d28c6d60f0c880fdd..02c3fddf2f0e051e6999322d14e7f207bbf9f5fc 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -658,7 +658,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Qman/Bman */

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 15a29cb0c4e6cc99062a7a8204a4bd84fa11fad2..bd8e46e942271bfc791af2f9943b102ac4effd0f 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -542,7 +542,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
 #endif
 

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 45aaf906f71018a0c8cae4936528fc9921895d4a..82d3f102e55411966d5c44b3ca3461f9f04ccbd0 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -652,7 +652,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Qman/Bman */

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 606c928674f34a9a7de2a9348c236ccd28012f0c..a9835b9317ef3035b81798f57ba5ce8520c61614 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -721,7 +721,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
 #endif
 

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 825bf25b46bc379ccbf27edb9564d7f5a2469efd..1e2b94e74f15e3c482b109c0dde67bf38fc15f15 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -670,7 +670,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 91aa12dd460eed07c31e09d453b055eb7a62d9de..2bcb362121847dfed992d526b62faffbfdf96bbf 100644 (file)
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -519,7 +519,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_ESDHC_DETECT_QUIRK \
        (!(readb(QIXIS_BASE + QIXIS_BRDCFG5) & QIXIS_MUX_SDHC) || \

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index be18f66c269806e8dc8595475dd1ffe9bb01001d..2a1b547ae1cf9b7eb82285350eb89d32b045ecf7 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -699,7 +699,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index ad1a387cd2755548e4f695107e9d0ae817a0bad0..28f4b148b223bbe01acd43e667b5be920fb584d8 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -473,7 +473,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_MMC_SPI
 #define CONFIG_CMD_MMC_SPI
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Misc Extra Settings */

diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index dbf85e1ca263458035de4f58bf394a200b9c02a8..a2cdd71fd91f53fee32c7ea205ee7d0ba10516b5 100644 (file)
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -100,7 +100,6 @@
 /*
  * SD (MMC) controller
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FTSDC010
 #define CONFIG_FTSDC010_NUMBER         1
 #define CONFIG_FTSDC010_SDIO

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 33f9e338684478c054ed0c3fa085a806a00ecdcd..1736426f46547e117a6ab313ff162a30f20bdc21 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -52,7 +52,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 /* USB Configs */

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 726e6d6cc117ff9d4e4752eff4774df004fdd0b0..e338fa9558b74c1f35733941818c0a26f8add34b 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -87,8 +87,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR           0xee200000
 #define CONFIG_SH_MMCIF_CLK            48000000

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index b91660334247eaf28b7ee8b13bec8acd067ec3d0..5d568604a6405adc1ff788d67e9deb1cb9de67a0 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -75,7 +75,6 @@
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
-#define CONFIG_GENERIC_MMC             1
 
 /*
  * USB configuration

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 1b9d5ff84198ddefd4d86f31b57b134955c65b79..13de819245755ad9275a4baa4637fa1423a6dad4 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -76,9 +76,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /*
  * USB configuration
  * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8cc38743d63b97be7b5849df949d27c9f303be95..8e8892ef004e2b0c19b53893f6436eec2d5acb39 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -67,7 +67,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#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 e645ad201e999a3e6e1de6ce0617e331b05a4050..e2acc6e8c9c5dc1eecd3b62ab36827bd88a43258 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -25,9 +25,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC support */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index caa821b9ed93b9c34672bad4a9fe869c1371bfa0..504bf92ffb62469f3f0b26a6d7c4473ede7799ee 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -307,7 +307,6 @@
  * SD/MMC
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MXC_MCI_REGS_BASE       0x10014000
 #endif
 

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 724231fb612c1b85bd337541ac13fa0a3c03b290..022353c7fb0ad936093cf6cc929ae458eb7d779a 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -145,7 +145,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d8bebdca77fd98e3893780ed9b860e41c88d318b..1fea328f14d19fa14d583aa7197880038d4f6586 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -103,7 +103,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 1f8c2672b30ebb78a81bc054ac7c0cdca91819ff..8577a11f7c216d87e5a2695d7549fc8600f56729 100644 (file)
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -98,7 +98,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 15b3e841e6f9f6ffde49382bc5bc795137b6d9de..c4ac21d351f34f9b8ac3001085f700da2b5d5bae 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -122,7 +122,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 79d58dd6aa97c4ed9d002692d1c03df16ae7f8ca..4d0e7b48f11501bd64585169bd4b6ce718958cf3 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -105,7 +105,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index f41402333fcfcf0e840d87dfe8ef0b63b041073d..897ffa9a0af781f65e5ed319ca92a305b04c128a 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -110,7 +110,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 2881cc83ede3e44a07fda61941d849252bbce5ef..d966e1c2a07b6daeb49399714adfe2e47c8f4f4c 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -85,7 +85,6 @@
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC
 #define CONFIG_GENERIC_ATMEL_MCI
-#define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
 #define CONFIG_SYS_DCACHE_LINESZ               32

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 9128b2e7bc5f766df8a5a50c1958bdb1bc4b9a00..8a9215e8a8aa088ca67b2540f3bbac39fa273937 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -104,7 +104,6 @@
 #define CONFIG_SYS_NR_PIOS             5
 #define CONFIG_SYS_HSDRAMC
 #define CONFIG_GENERIC_ATMEL_MCI
-#define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
 #define CONFIG_SYS_DCACHE_LINESZ       32

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 5b101ba47a28f14e8a47c9920f6009b0bd448bbd..c9a36bc7745cfc2cdfd191ff224f3f9e1fd2f700 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -106,7 +106,6 @@
 #define CONFIG_SYS_NR_PIOS                     5
 #define CONFIG_SYS_HSDRAMC
 #define CONFIG_GENERIC_ATMEL_MCI
-#define CONFIG_GENERIC_MMC
 
 #define CONFIG_SYS_DCACHE_LINESZ               32
 #define CONFIG_SYS_ICACHE_LINESZ               32

diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index ce5392c7f4a5eb14a5bdf009130fc04925fa8783..0707599a1cfed0a081363bdd32237e5758212c52 100644 (file)
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -81,11 +81,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  64
 
-/*
- * SD/MMC configuration
- */
-#define CONFIG_GENERIC_MMC
-
 /*
  * Ethernet PHY configuration
  */

diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index 60c513982ed24a749f5e7c4305c23d76a50a5175..3efdbd2d8ba0f93caaa6b5e66de85b491e6791fc 100644 (file)
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -23,8 +23,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_GENERIC_MMC
-
 /* Environment configuration */
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OFFSET              0x006ff000

diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index ab26a250bd104e8191a916501da1e41a645877be..8368e151a5cd1af8ddc9936104632edefa7e2806 100644 (file)
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -31,8 +31,6 @@
 #define CONFIG_KONA_GPIO
 
 /* MMC/SD Driver */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR

diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 0c49563eb51e770a83fe1b6eab50bd034ca36c73..299674ad491d975be93e2eff3f48d122fbb4c909 100644 (file)
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -30,8 +30,6 @@
 #define CONFIG_KONA_GPIO
 
 /* MMC/SD Driver */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR
 #define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 0fe47ec4abf362ef48bf81479d54f4fb638cea9c..cc328611695dcf9c90dff221421d3db4181abb8d 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -26,9 +26,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 05b338ff1246f2d21db23a11cad6559c04a099c4..e3c22869bc26da89aa5cd067933ce9ae12856582 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -128,7 +128,6 @@
  * SDH Settings
  */
 #if !defined(__ADSPBF512__)
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 #endif
 

diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index 40ca18d2b1570767d934961097ba51d1086e88e3..e433aaa91d3e0e9973b03f46c59c2897a7753571 100644 (file)
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -115,7 +115,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index ab777e54eaf59edf43e9b9d7380627cbeb5592bc..685815372062e797d5f80c0a48e0793c9c01cf4a 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -124,9 +124,6 @@
  * SPI_MMC Settings
  */
 #define CONFIG_MMC_SPI
-#ifdef CONFIG_MMC_SPI
-#define CONFIG_GENERIC_MMC
-#endif
 
 /*
  * NAND Settings

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 81d5af604664fbd1aee4b1c2ebf328e2334dccb2..35cbebdfb80eb26f8cdbf7483c6cc8b67905d3eb 100644 (file)
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -142,7 +142,6 @@
  * SDH Settings
  */
 #if !defined(__ADSPBF544__)
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 #endif
 

diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 55127c58a89e715e019f7cf1ab412e4e01de2c67..5791810b3529019b10281c0d71e05e551bf99f31 100644 (file)
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -126,7 +126,6 @@
 /*
  * SDH Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 
 /*

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 0deb350e3fc8bacc286fac782c6aeba4cd3a5cd6..e040dbaede260b65650d4536d520466995ce97b0 100755 (executable)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -95,8 +95,6 @@
 /* USB */
 #undef CONFIG_CMD_USB
 
-#define CONFIG_GENERIC_MMC
-
 /* Module stop status bits */
 /* INTC-RT */
 #define CONFIG_SMSTP0_ENA      0x00400000

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 8be483a0c4d5d226a103bac95227728560d66b2d..68e9efef1c254edb1f09ae2ef9991000c24a773a 100644 (file)
--- 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_GENERIC_MMC
  #define CONFIG_SUPPORT_EMMC_BOOT
 #endif /* CONFIG_EMMC_BOOT */
 

diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 4a97bf1dd597c24baf326ba65118cdfc81df678e..02094b58af3b5ca77f8af463ee8a45ba724f0a12 100644 (file)
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -43,7 +43,6 @@
 /* GPIO */
 
 /* MMC/SD IP block */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Always 64 KiB env size */

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 7e3966f47803e0fbdb57b29ee128c1393ac5802c..e338f9bdd254edddedca8f688fc01a374e2a3f73 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -30,9 +30,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)

diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 9439863bfed5824d16c535cb7941863438b8bed9..5ec63cd8becb0fccb89f80076809880826a014a6 100644 (file)
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -29,9 +29,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 1ad096924ec7acbc49912bfe5d6a5b55c6f0ea59..a544223f7ecbd28cdcf9bc791b735dbfd22340fe 100644 (file)
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -43,7 +43,6 @@
 /*
  * SDIO/MMC Card Configuration
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_MMC_BASE            MVEBU_SDIO_BASE
 
 /* Partition support */

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 32229d21825e79bd6c4943c6ac075b4c04ee89f2..cc31a30dbb93f3cc2db0be7b3970e0535a2c113c 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -118,7 +118,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index dc2eabd3e5aca5b7501731f2909b6cdd085c5ed2..282eb4f0b2908cdd6e6e8038a77f78ffc38eecfd 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -116,7 +116,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 2bc486a59fd4056cacdcfba5820b45e954001358..017a8bd47f1b7bdd20d729c2a31c89448156522d 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -80,8 +80,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-#define CONFIG_GENERIC_MMC
-
 /* USB */
 #define CONFIG_USB_OMAP3
 #define CONFIG_USB_EHCI

diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 907bb3119b182056c953b03581aa377928108519..da866e4fba78be9828679b380e2a3f7919ed8345 100644 (file)
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -87,8 +87,6 @@
 
 #define CONFIG_OMAP_GPIO
 
-#define CONFIG_GENERIC_MMC
-
 /* USB */
 #define CONFIG_USB_MUSB_AM35X
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index de43fca45bfe91f00d43ed90a60d4d400496c663..c4765ebc77706c1b974a16de05aa3012a8bd4439 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#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 05202837d7323ea99132fd18dba05eb14dbde5c0..8b854c37a132d6cac46379cb3758ff4aa28dcae0 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -24,9 +24,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC support */
-#define CONFIG_GENERIC_MMC
-
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 5b66429b8e562489195bbbed94c5194ec0c8cd20..bc1904418d53ec4e100d79024ced0d48938af69a 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -25,9 +25,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC support */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index e24191a05c09322650720a7760ad1d6993dbab48..e0feb0a152f0386334d1df35e2194a8a2e8f8f91 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -57,8 +57,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_RBTREE
 #define CONFIG_LZO
 #define CONFIG_CMD_UBIFS       /* increases size by almost 60 KB */

diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index d21c95abb5819b6bb9ffdc321be618024434465a..a70845e1017a1107eba80fdd8f4f17db56f7bfa3 100644 (file)
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -23,8 +23,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_GENERIC_MMC
-
 #undef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index b1d67b29b5c80444cd1bfed3779c6c8938333752..e5d60fbf3c09bee70407bfc11f8f700ec3288f18 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -206,8 +206,6 @@
 /*
  * MMC
  */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 0f48f381e52bbf90a09bb843204396fbbd5221a4..7637bb8777ce7d839fa18487450e5de32f7d03ea 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -620,7 +620,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Hash command with SHA acceleration supported in hardware */

diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 219944ae19c6c873afa7340510bd0f2f9522f0d2..5ec09ba5c443f7eff0060d732ac8c3d84e3ff1a0 100644 (file)
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -24,8 +24,6 @@
 #define CONFIG_SCSI_DEV_LIST           \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
 
-#define CONFIG_GENERIC_MMC
-
 /* Environment configuration */
 #define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OFFSET              0

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 18a9156e81a2b84154ff8c1de06addbe380fe887..c9a57afbaea5bc77d3aaba3236adbaad329c9465 100644 (file)
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -442,7 +442,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 3321419ac694b4ecbff37da73988e78241a9bfe5..ecefa979f590c27d0deb60d7c17894f93be9eba3 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -310,11 +310,6 @@
 #undef CONFIG_CMD_ENV
 #endif
 
-/* SD/MMC configuration */
-#ifndef CONFIG_USE_NOR
-#define CONFIG_GENERIC_MMC
-#endif
-
 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
 #define CONFIG_SPL_FRAMEWORK

diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 1fa445a94c85d21bef89302653aabee6cd8165ec..f3ff9e7494b0892c6693c186e0917a6fe234f5da 100644 (file)
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -23,9 +23,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index beb14bcd92d6d8ba1989f22c39d09a04454170e9..1fdeeddc5bd2b58a2ca3986c01a93962a4fbf44d 100644 (file)
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -43,7 +43,6 @@
 /*
  * SDIO/MMC Card Configuration
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SYS_MMC_BASE            MVEBU_SDIO_BASE
 
 /*

diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 211c9ea130c2dfae52b0124957dca2736f23d18a..edb495842b0249be583a43cee6908fd8e19d5070 100644 (file)
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -28,8 +28,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_GENERIC_MMC
-
 #undef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 29aa51830627cb91564d3e37f0accb266447b8a9..da1c58983a568d586b60970ae6973d27cff75639 100644 (file)
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -31,9 +31,6 @@
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              19000000
 
-/* This are needed to have proper mmc support */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
 
 /* Fixup - in init code we switch from device to host mode,

diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index 064906d6d35cfef80ffcb22f8fcdbb868ec4d372..b6a758f0b20a555f6ffce3a89586424bf78e926b 100644 (file)
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -21,9 +21,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 03fa0a328f8fae96303d6f28e0cb5d298b394de0..a3c40d68aa5266057fcbd0ba897c2838bdcb831a 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -126,7 +126,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define CONFIG_SYS_MMC_CD_PIN          AT91_PIO_PORTC, 8
 #endif

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 7868c86e59bc34327dbfa442f9c747320cde33ee..6f57b21b304632e3c37b2b93b397b7306ef36b47 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -37,7 +37,6 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 /* PWM */

diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 986001e9b7ac195c204ba571ea6d9c5d78c7323a..dcbaade54e1e736ec183b33cae4672933d66b6cd 100644 (file)
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -26,9 +26,6 @@
 #undef CONFIG_SCSI_AHCI
 #undef CONFIG_SCSI
 
-/* SD/MMC support */
-#define CONFIG_GENERIC_MMC
-
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 150c4b282316e45e7012a57327a709c027040c5c..a2adbeba74d569ade0ed1b04ec6b29a5af3ceb8d 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -64,7 +64,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 /* USB Configs */

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45395cdda6f0d2b7da0411afaada0af3cd8571e7..15b3227a77fe5cc2324046da7852e095849bb9ac 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -94,7 +94,6 @@
 #define CONFIG_SMSTP7_ENA      0x00200000
 
 /* SDHI */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SH_SDHI_FREQ            97500000
 
 #endif /* __GOSE_H */

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index e9781ccf5f3be5163f21a2e0504982e3123c6b68..923c38f96857e838db8ca17086e77aa7e14b95d3 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -26,9 +26,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_HARMONY
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_TEGRA_NAND

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 0f6f11755ddc18f8c9cf405dbe2eb1e34056a199..9ec81402b4ecbf059f1fa267c80364fc65a193b1 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -69,7 +69,6 @@
 #define CONFIG_HIKEY_GPIO
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_FS_EXT4

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 311e2bd94bb88a2f41dc0e355c9a1c983bf0f658..5528dfc8104c30bba41689ec491cd693e9787da0 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -26,8 +26,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_CMD_FPGAD
 #define CONFIG_CMD_IOLOOP
 

diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 26be24037c7dea702e43ff00bb28cc7deb9a170b..cbd1dbc9c1e20bcb8311de55ebb624e7c9fb4121 100644 (file)
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -134,11 +134,6 @@
 #define CONFIG_JFFS2_NAND
 #define CONFIG_MXC_NAND_HWECC
 
-/*
- * SD/MMC
- */
-#define CONFIG_GENERIC_MMC
-
 /*
  * GPIO
  */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index febedca5f22779fd2971d42a83772d6fe1e807ed..7c0456c5ce363cdcf7b2dd0ba01fb9f957800d47 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -25,9 +25,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 81da8ff9e634cbe0cb6060a9273b5885dedbeb2c..bd252312a20b146748a7bc86469038223a927819 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -60,9 +60,6 @@
 #define CONFIG_PHY_MICREL
 #define PHY_ANEG_TIMEOUT       10000 /* PHY needs longer aneg time */
 
-/* MMC/SD */
-#define CONFIG_GENERIC_MMC
-
 #undef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE              "mmc"

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 8223f5a33b3cf52d928b51aebd616b7426c28e35..33b6a987ae9bc0b9daf330d7f9dced3c6509a2a0 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -84,12 +84,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-/*
- * MMC
- */
-
-#define CONFIG_GENERIC_MMC
-
 /*
  * Power
  */

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index c7aa7cc084136a9324b97a850edb0ec1d4286523..6371c5b9069983c6f2d1a0dd51aa6e234ae09cf5 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -94,7 +94,6 @@
 #define CONFIG_SMSTP7_ENA      0x00200000
 
 /* SD */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SH_SDHI_FREQ    97500000
 
 #endif /* __KOELSCH_H */

diff --git a/include/configs/lager.h b/include/configs/lager.h
index a7894ca19b361666db6216fe38a43627f2579133..f30cc16e91f204c8a3bee66aa4694d28045e3113 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -86,8 +86,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 
 /* MMC */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR           0xEE220000
 #define CONFIG_SH_MMCIF_CLK            97500000

diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index ce058b162584fd1c61681fcc24cb59dbc7f3a880..1d4e7cd6fcf1c912e2075b79305e727dc39f5890 100644 (file)
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -213,9 +213,6 @@
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE                (16 << 10)
 
-/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-
 /* additions for new relocation code, must added to all boards */
 #define CONFIG_SYS_SDRAM_BASE          0xc0000000
 

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 578d32814d62ec4214bc35d1d5cdb7d64b470ca7..5aaf3a7c6a429dcb52ee9624f2e0bab7ee29076f 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -134,7 +134,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* SATA */

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 09c8f79ff358abeae8ed84c89bca9a7c927be7a3..70d3a71eb37527b75e7cca2ae8170e3440390a45 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -47,7 +47,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* SATA */

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index b42286306a8fbf2e57eee7766216840ed4d23ba8..4941c2ebc8022817d89442bc4763801b1f44c345 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -156,7 +156,6 @@
  */
 #define CONFIG_CMD_MMC
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 
 /* SATA */
 #define CONFIG_CMD_SCSI

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 3c255aad827a94adee07d6b553e01b90769bc393..5c9b41f2e7e19e7e01c29d667891d2e1b9f04f84 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -393,7 +393,6 @@ unsigned long get_board_ddr_clk(void);
  * MMC
  */
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 7100d96baaea88d1de5c53948ecd0f4653709f57..25e3f92cf5105d3e50f57748443fe904923cc6e4 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -294,7 +294,6 @@
  * MMC
  */
 #define CONFIG_FSL_ESDHC
-#define CONFIG_GENERIC_MMC
 
 /* SPI */
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index aa2b6f119052857d2ae37d9671aa262be27f1fab..ea7067c6aee755a3cb65d710307120e39a90570d 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -130,7 +130,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /*  DSPI  */

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index b089f3171cc1eefcf2e793db15439ba0f92ef42e..be65e4fd76c546eee914f486031f7e5200bd456c 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -116,7 +116,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 #define CONFIG_FSL_CAAM                        /* Enable SEC/CAAM */

diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index 31d28c7445ee3a6a7951c3fd1c8c7309fc943b52..5dd0a1d3cb2e1ac02dfb5a82b13a216f6746a216 100644 (file)
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -136,7 +136,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Debug Server firmware */

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index a8a510028278163872821512bcb8dcc04b7227bf..9ad8486df488fa3d05238f05154bf969bd03fca8 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -353,7 +353,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 /* Initial environment variables */

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index b607329cc1b95646b26662fee37a1e7c69539f96..db9ad157ac4380a9fb9a0107eca347f0e8d0624a 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -298,7 +298,6 @@ unsigned long get_board_sys_clk(void);
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_GENERIC_MMC
 #endif
 
 #define CONFIG_MISC_INIT_R

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 29563e9b7c685f0da2fda2f9425a4e67b1b8de94..df7321f1b5713e27a2348dd6a3eb5850e9ef4824 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -80,7 +80,6 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 112869ed26a502ef8865b374fea7b001bf8a8e5c..aed0f4b65f86f5aac3539d0d538cff08b6e723f7 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -86,7 +86,6 @@
  * SD/MMC
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0928f7699052f396886271acab186be80eba209e..5160758382e4272172538c7403e5c2f5233c48d6 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -79,7 +79,6 @@
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
-#define CONFIG_GENERIC_MMC
 
 /* EHCI */
 #define CONFIG_OMAP3_GPIO_2

diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 1e94dac3798760a4f22265676018c1f332a8f7b8..342bcf3051d094fabc734235c345dc2cc02e1228 100644 (file)
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -19,9 +19,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_TEGRA_NAND

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index b01ab14ecfdf169b1f69f76561ec8ad6d2853eb2..7b9f90c08d832f715477fd4e33d8c8224e0a62e1 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -25,8 +25,6 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_GENERIC_MMC
-
 #undef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 75f166aaf37ecc19a1945d55d59cb6ddcfa0fc52..ebc7fca3d1f66623bcc4db7f07f492aa881e32f9 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -114,9 +114,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                         CONFIG_SYS_SCSI_MAX_LUN)
 
-/* MMC/SD IP block */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SUPPORT_VFAT
 
 /*

diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index b9954b8f4a0ed8aca2a9013cec50d06a11a0ea20..829f6938b1733a6b55dd15ea3b5ee091c90c285c 100644 (file)
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -126,9 +126,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                         CONFIG_SYS_SCSI_MAX_LUN)
 
-/* MMC/SD IP block */
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SUPPORT_VFAT
 
 #endif /* _CONFIG_MVEBU_DB_88F3720_H */

diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index dc90c6e3ac05d6f258e0629ffbf4b3602d144e6b..528b193d7000b33b90b58159209bad5e5e0946d1 100644 (file)
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -84,7 +84,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* ESDHC driver */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      IMX_MMC_SDHC1_BASE
 #define CONFIG_SYS_FSL_ESDHC_NUM       1

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 1aaef23de460e107cbdec7a27191430b1a33be9e..22d319acebe9b30b89b3f56dccbc007a1517a07f 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -213,7 +213,6 @@
 #define CONFIG_MXC_USB_PORTSC  (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI)
 
 /* mmc driver */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index db22365e9bdd5827262927d5301e700a5fcbd8a3..1f99a61b0d64d26c2add21b697215b9b743edf11 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -65,8 +65,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      MMC_SDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /*
  * Eth Configs
  */

diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 7a47a87ff5114f701f03932bb7400e3ec020b8ab..c17d976354bffdf305be1f09f3d78bcf0e2fc328 100644 (file)
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -52,8 +52,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
 #define CONFIG_MII

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index b13d79b41f985a6c469bd6921da43a2f5a7def3e..03e9a2abe0dbf714343b484cc88ac08e232ae8e5 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -36,8 +36,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /* bootz: zImage/initrd.img support */
 
 /* Eth Configs */

diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index e4c90f48bcc0d02b8d35dbddfe828cb837e22a79..839c8ccfaebf1e99b1f211f995a68fa3d0199296 100644 (file)
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -50,8 +50,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /* Eth Configs */
 #define CONFIG_MII
 

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 427ae7510d6b2cd6afe6173fc46826f1ecd77545..c7ab2958999ecf291dd2ceac6b32dd28457c1968 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -36,8 +36,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /* Eth Configs */
 #define CONFIG_MII
 

diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index e16349533ecaa58cd491d14125a5001622186ad5..3ac89f2fc2904d601a6fa029c3a55ff4bb8c84d7 100644 (file)
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -42,8 +42,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
-#define CONFIG_GENERIC_MMC
-
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
 #define CONFIG_MII

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 5b38aa214064861290d901b8a9570c81a7f23a27..cdf46f016ecb2dfe437aaae4331b2fc061c26884 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -81,7 +81,6 @@
 #define CONFIG_MXC_GPIO
 
 /* MMC */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index bdacedcae221566b72fa60dcc4ed79e26fd776fc..837d5f7322312d032afacb543b93e81db620b239 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -55,7 +55,6 @@
 #define CONFIG_MXC_UART
 
 /* MMC */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 6a223b683f0ecc4c1fe98cb6f1bcc48c63594c9f..12b456b3bd97ce9c07cb207dedff61c8f123bae5 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -146,7 +146,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #endif
 

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 82266d48247e52267285f77543a0a2e5e7dd6f87..7e2f9925c33c7fdccd76d36f36b536dc1745ca6d 100644 (file)
--- 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_GENERIC_MMC
 
 /* USB */
 #define CONFIG_USB_MUSB_UDC

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index be0889d443a456a3cb5dee266012bbce310cb660..acf9d66ae04e853a7d6493bce074b5823fd4e0b2 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -24,9 +24,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 297fd0ee933f13cb4c09bc023f964eff701cf2ea..8846aa6607cecfbc2708f8b52218d62f9d852292 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -46,9 +46,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-
 /* SPL */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 4c640110d97f2e5ec1eda8e38f5a1428ebb1df90..8114de814b730b4c04b167d6ba4c23f36f551235 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -324,8 +324,6 @@
 #endif
 
 /* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 #ifdef CONFIG_MMC
 #undef CONFIG_ENV_IS_IN_MMC
 #endif

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index c21b8491228de620a932dafa8d33e4fd636d8745..51e4d90a2e98f214383fbb27e34ac1e6607ee8e8 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -107,7 +107,6 @@
 #endif /*CONFIG_MVSATA_IDE*/
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MVEBU_MMC
 #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
 #endif /* CONFIG_CMD_MMC */

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 5d70878c82373beecbfd2761a42c2ade9ef3483e..9b142bc6f471e3fb9bf088b05379256927067781 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -840,7 +840,6 @@
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 #undef CONFIG_WATCHDOG /* watchdog disabled */

diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 52c544c0fcc01b9847e52e0d276340d8fe3126e9..a98e1b2b17f5bb3f21a78988276eba1df9691849 100644 (file)
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -406,7 +406,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#define CONFIG_GENERIC_MMC
 #endif
 
 #undef CONFIG_WATCHDOG /* watchdog disabled */

diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index a1a518e18c8af5c0e190e6a009ce5920c3ffc734..897add3dd05f52234ccf311df09416774f1bbda7 100644 (file)
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -21,9 +21,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index b80d8dbe0ad6da3b6d8dafa12eb6281d71fa1042..3cf0c87be435cf09bc095dcd63870db00157d17d 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -21,9 +21,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index ef1ae3f80652bd577868a833fdec128956819a2c..76fb7cec87aed76064546dba38f2c8e8b449b455 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -22,9 +22,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index e1e3d72da0f570bafc86f65d6c78ec77be2fcfc2..791a48a3be11284c8447e9089bd6bd176a8f33fd 100644 (file)
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -17,9 +17,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 13d5aa916f1e09cf47d2e59629332379975f536e..fe7be6983dbad78fb60ff5d3b1ce2b2316b37461 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -22,9 +22,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_PAZ00
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 96bf6ab03b266b4865d4b8816cba7efe0edcb036..283abfa72644c592684b9b7181d2f05a8ae05763 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -69,8 +69,6 @@
 
 /*#define CONFIG_ESDHC_DETECT_USE_EXTERN_IRQ1*/
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index f80f3af777066782b448f201dc75631973d5866b..ffd1b28cba3d53bbcf8d6f1b1198dfa41e49c984 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -88,11 +88,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*-----------------------------------------------------------------------
- * SDHC Configuration
- */
-#define CONFIG_GENERIC_MMC
-
 /*--------------------------------------------------
  * USB Configuration
  */

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 2f3f7be7d01f6a0eb1d2087dd62a5ffd71405c83..63bd11ca4680611da1178b9876189e128a30b78d 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -34,8 +34,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
-
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */

diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 476bdd86b4c78dad287b4dd8939a5b97024c821e..327db73dd3f5ce9b0608c533606e3d7532a70f39 100644 (file)
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -91,7 +91,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 889ef40670161e3bd9d61cdb4ffed50b09363ef5..911cad8cdd7391a9ea5dcf0428f78c28c8bb4850 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -19,9 +19,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_TEGRA_NAND

diff --git a/include/configs/porter.h b/include/configs/porter.h
index ccaa7962719401bcd026618f547cc1b92940563c..ed3125de90fa477df41db9ac25157a65ad63eba8 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -88,7 +88,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* SD */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SH_SDHI_FREQ    97500000
 
 /* Module stop status bits */

diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 800c12c92cc41f91468550729366487257a3829f..345e6d6db4d206742e5d3409b919748fc7767ae3 100644 (file)
--- 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_GENERIC_MMC
 #define        CONFIG_PXA_MMC_GENERIC
 #endif
 

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 9e0b445c6f0fca5bb78a7ed026e08c71c4425004..cf2f20b50600839bccefd6a275743e23410a3aa7 100644 (file)
--- 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_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_FAT_WRITE

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index e0d1d841c38c7b43d1300479e1d1704cd394934a..ff8a6ece4a064255483734ee6d71b69fe68b8362 100644 (file)
--- 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_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_FAT_WRITE

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index bd84239b79f06d0ced9f8fb6d7db6c21a3c51783..ab8bfd188e56e7d11a493473880eba3267d68a2c 100644 (file)
--- 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_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
 

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 4ba04e31798c7bd0650434732e903148afb94123..a545850668c7388a89edc1df7825b15a8e85ce44 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -81,9 +81,6 @@
 #define CONFIG_VIDEO_BCM2835
 #define CONFIG_SYS_WHITE_ON_BLACK
 
-/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
 #ifndef CONFIG_BCM2835

diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 7c524c13d3cff8dee2914c7ef83629cc2b599147..33490c2869315065a507c5ddb0b4a948adc40008 100644 (file)
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -82,7 +82,6 @@
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
 #define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 /* #define CONFIG_CMD_EXT2 EXT2 Support */
 
 #if 0

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 55aba11d59446b4a2b9ceda7fe03e948e4456a90..472c366972ec9b6b18b87cb77db92a168d8d3a53 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -47,7 +47,6 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* MMC */
-#define CONFIG_GENERIC_MMC
 #define SDHCI_MAX_HOSTS                4
 
 /* PWM */

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 0e73fc2244974fe015ce019c22f6f706d0798643..8e7358687a72cd502c9126c0165a832db83db2f9 100644 (file)
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -41,11 +41,6 @@
 /* NAND flash */
 #undef CONFIG_CMD_NAND
 
-/* MMC */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#endif
-
 /* USB device */
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index daf634f4deb5de12f4f21a3c5c77f3dcbabcfd77..2a8b8a1a6ea07dee19326c1bd27ba90d76ece217 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -81,7 +81,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define CONFIG_ATMEL_MCI_8BIT
 #endif

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 3c2e8a5f3f45e5c056024e25334f9cbac2130356..05e96f9fc4039fa7e3033aea2f58ef131e919986 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -112,7 +112,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI0
 #endif

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 520552f18eb146c4af4643813bf6a043395dec07..a017b26f872661adacc6a5a0bd69c3546dbb3e61 100644 (file)
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -64,7 +64,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI1
 #endif

diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 4cd016d03435991ea4ee21dbf349fb307f46f82f..354e5104c52fc6028199baee68fb6cbdd3204d47 100644 (file)
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -64,7 +64,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI1
 #endif

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 28228d1b1baf10d2c4327211ad26e7f97e688cb1..25af94d885d7eead981c20f1b8439dbdec6c0e0f 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -203,6 +203,4 @@
 #define CONFIG_SYS_SYSTEMACE_WIDTH     16
 #define CONFIG_SYS_SYSTEMACE_BASE      0
 
-#define CONFIG_GENERIC_MMC
-
 #endif

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 388010cb5c2ece3f65374e44c35d577b65e9131c..671afa71ec4943c2ec1965c276dbcc65c5f2d078 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -31,9 +31,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 7f8edd47e14537125d2d6d92f3bc9787a9ef433a..77116049a739bb2e60453984e8b462f185012a38 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -85,7 +85,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC             1
 #define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index d57782ccc093a411c8e4c8342532db2e53c4f2eb..49729f447e74b044be3f05e98dd0cf509663882c 100644 (file)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -85,7 +85,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC             1
 #define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 5582b09f0d31d6406146552a6bcca62b01ca9e27..0793f1e03e44828fb8837a381bea544454444953 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -86,7 +86,6 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC             1
 #define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 79dfe50f786c09a0ffa36dbab26418066e622ca5..a1110573134a7abaa02dd742e9386dc7cfcbe914 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -83,7 +83,6 @@
  * SDIO/MMC Card Configuration
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MVEBU_MMC
 #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
 #endif /* CONFIG_CMD_MMC */

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5ce1430d5a78b31fb3fede2c91978d14c4ce3ad0..327a806bee7c859ef5a05fb757998fc2bb1162cb 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -76,8 +76,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x81000000 /* Default load address */
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
 #define CONFIG_MTD_DEVICE

diff --git a/include/configs/silk.h b/include/configs/silk.h
index a343cd1daaa69251e56a9d57d875466d08b779eb..b43de8de1492536dc90cf0aca49a3d94069681f6 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -88,7 +88,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR   0xee200000
 #define CONFIG_SH_MMCIF_CLK    48000000

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index da395d8fedcf78c0ff2ce8033621ee9e104c8145..b0ed9eaf0e34d79473fa69cd0fca710167d42532 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -67,7 +67,6 @@
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
 
 /* MMC */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 
 /* LCD */

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index f41d6f6859c789a139b86a3050ac233b1a7dc77e..4f8a9f85f4c3310fab33171c667ff6e1587b4277 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -91,12 +91,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-/*
- * MMC
- */
-
-#define CONFIG_GENERIC_MMC
-
 /*
  * Power
  */

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 27bbd0ec5aed7d4217faa434a6b5556dfbc79a1a..8bbe3c5eed3a31e61683914115f9c54df6205a77 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -141,7 +141,6 @@
  */
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_GENERIC_MMC
 /* FIXME */
 /* using smaller max blk cnt to avoid flooding the limited stack we have */
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   256     /* FIXME -- SPL only? */

diff --git a/include/configs/stout.h b/include/configs/stout.h
index d2bc0506190141294a14de19c1ce82bbfe500f82..28bf5539df06b59911ac1cefd034d9928f308406 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -89,9 +89,6 @@
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Module stop status bits */
 /* INTC-RT */
 #define CONFIG_SMSTP0_ENA      0x00400000

diff --git a/include/configs/strider.h b/include/configs/strider.h
index e3f094576c4316da6b9936b68b85b0091ee669a8..f65e6022999541ba19d03d03ae04faecc77212ff 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -26,8 +26,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_SYS_ALT_MEMTEST
 
 #define CONFIG_CMD_FPGAD

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 3ac96da1909cb876522d99ee65e94d0f198e807c..5d76e9ff9a09675aa872e64b252a468f8a455288 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -140,7 +140,6 @@
 
 /* mmc config */
 #ifdef CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SUNXI_SLOT          0
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* first detected MMC controller */

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index e6015301bbd4b2a5a533edee2c21ce6752fb55c0..6bc2336b23f4b8d615d315d67ca1ea9a1a6a2ca7 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -73,8 +73,6 @@
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
-#define CONFIG_GENERIC_MMC
-
 /* EHCI */
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index d93f9f350bc2fc8fbd1afe51718e8be52049923c..dafb05fa072383079a710bb714d37465f9ef65e9 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -68,7 +68,6 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_BAUDRATE                        115200
-#define CONFIG_GENERIC_MMC
 
 /* GPIO banks */
 #define CONFIG_OMAP3_GPIO_2            /* GPIO32 ..63  is in GPIO bank 2 */

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 97aa04685480dae86a1466db39ae2ed0f04a9202..4d1cdb507b5c39dcdd98f62d1ef746fc093eb74e 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -118,7 +118,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index dbc9fc023eb86ce6f6fcb33152d14a16068383dc..06d8720df2b6990cf28cfdc0b9f430f1c98f8afa 100644 (file)
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -20,9 +20,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)

diff --git a/include/configs/tec.h b/include/configs/tec.h
index 278668c2c73677d3d3b9a6e00e0ac6d228286305..ebfca8f3199b995d10a8894840b9145276502f14 100644 (file)
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -19,9 +19,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD      /* UARTD: debug UART */
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_TEGRA_NAND

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index b0c1282405b96e5c1c57092c10a0bf7c4cb1bb62..ab4136ab1389476428598229f024f38824b65a79 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -114,13 +114,6 @@
 #ifdef CONFIG_CMD_I2C
 #endif
 
-/* remove MMC support */
-#ifdef CONFIG_GENERIC_MMC
-#undef CONFIG_GENERIC_MMC
-#endif
-#ifdef CONFIG_CMD_MMC
-#endif
-
 /* remove partitions/filesystems */
 #ifdef CONFIG_FS_EXT4
 #undef CONFIG_FS_EXT4

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 0a905d2702cd484fca32e3ee39c4ebf3d1e15630..aa4561c5f7128ed2a67a1b6d4e8d26f85ad60b12 100644 (file)
--- 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_GENERIC_MMC
 
 /**
  * Physical Memory Map

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index d3e9e41568f058cb27fb8e41fdb9b1f94fabcd18..d7b1719b5bb5444e0879a44b6141502842e092fd 100644 (file)
--- 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_GENERIC_MMC
 
 #define CONFIG_FS_FAT
 

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index c6a642fe633738044a8a437819a34435c69aae33..ca5794cec71dd30a9e0fc4657799ee16ce864d74 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -166,9 +166,6 @@
 #define CONFIG_DM_I2C_COMPAT
 #endif
 
-/* MMC/SD IP block */
-#define CONFIG_GENERIC_MMC
-
 /* McSPI IP block */
 #define CONFIG_SPI
 

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 5782851dae20d972580995b151a8baf71fc71635..d120c691e0e3ef802a21894519eedf7242ae9afa 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -301,13 +301,6 @@
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
-/* We wont be loading up OS from SPL for now.. */
-
-/* We do not have MMC support.. yet.. */
-#undef CONFIG_GENERIC_MMC
-
-/* And no support for GPIO, yet.. */
-
 /* we may include files below only after all above definitions */
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index fba27796ca29c8c51a62bb268e7f228f0e0cc872..654f9b4ec594b1318c8f9e89299e5705dbbeae40 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -75,9 +75,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-
 /* I2C */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 874351d9f9f360a9fcc167effd5572b74fb2b4e8..2c37107a3c080279a6c8b5f936665f7fbde7f305 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -27,9 +27,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in SPI */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ          48000000

diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index dcb3a2ea6f257e43da0bd26d26e578add92ab80a..f2937779fa01fa51a85837e2bd5eb2b79bc05a1e 100644 (file)
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -59,8 +59,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      MMC_SDHC1_BASE_ADDR
 
-#define CONFIG_GENERIC_MMC
-
 /*
  * Eth Configs
  */

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 62c3daff14b31ba68b86524dcda8b575e0d8dc57..22962392e22032ce3d91de6a4d107e1a9f50dd4f 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -127,7 +127,6 @@
 
 /* SD/MMC */
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_GENERIC_MMC
 
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index b32cd6a3916c37b6a4721cf6e2cbb8c611d04d70..01a2bd4060f9ba0d9b2b7c6e470f610607a6bdd5 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -42,7 +42,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
-#define CONFIG_GENERIC_MMC
 
 /* USB */
 #define CONFIG_USB_EHCI

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index ec12133a30af12e6e069d42aa4fca5c6d175fa2f..9e83863c0a4c0c7abd5b37d7c9b719ec7dc0294b 100644 (file)
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -22,9 +22,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 1150adfe7d94b7ec0a0c77687797142ffa56212f..87b5136facbbb508fe7a493f0a91aaa62976be70 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -20,9 +20,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_VENTANA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 0bc4ea58c58d185d6b3fecb0a14ccdcb877b10d1..3756e22ffa6cef8ff3ab4255baec6994bb209674 100644 (file)
--- 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_GENERIC_MMC
 #define CONFIG_ARM_PL180_MMCI
 #define CONFIG_ARM_PL180_MMCI_BASE     V2M_MMCI
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   127

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 3491ed5ca328d196779595e484b08374c94cfaa1..33b3438b068aa228a25319d28eb429bd7556dc97 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -66,8 +66,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
-#define CONFIG_GENERIC_MMC
-
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 7b10e44059758ffd69ab212e7b203f03ba71876a..b79ad5b76a9be5ef4abd6e66e22fea249fa95d45 100644 (file)
--- 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_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI1
 #define CONFIG_SYS_MMC_CLK_OD          500000

diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 19b57fd2235a05bfebcf8725d7c1eb9c0c3bbff0..429e5b6a3208d1c5cd02fda4188d5b753776b785 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -24,9 +24,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC */
-#define CONFIG_GENERIC_MMC
-
 /*
  * Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes
  * the user plugged the standard 8GB MoviNAND card into J29/HSMMC/POP. If

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 35ccd385d810522cd54ce1d0939dba4e35bbc1e6..7fec24c65cc32fac35b9fed037fb6cf8e0e5d742 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -55,7 +55,6 @@
 #define CONFIG_RTC_MC13XXX
 
 /* mmc driver */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index b4be217274e47da34610aa3fdac68459ef2fd7ef..7251ae152356c6fa4d00e2abd4d2333ad6e1a49c 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -76,7 +76,6 @@
 #define CONFIG_AUTO_COMPLETE
 
 #if defined(CONFIG_ZYNQ_SDHCI)
-# define CONFIG_GENERIC_MMC
 # define CONFIG_SUPPORT_EMMC_BOOT
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
 #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ   200000000

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 17c5346acc7120cda368d9af27390b137727b001..3df9a078a807e56c51e51202b01e1409408fc570 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -61,7 +61,6 @@
  * MMC Card Configuration
  */
 #ifdef CONFIG_CMD_MMC
-#define        CONFIG_GENERIC_MMC
 #define        CONFIG_PXA_MMC_GENERIC
 #define        CONFIG_SYS_MMC_BASE             0xF0000000
 #endif

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 3b0aca2fe37f353c61a344799b973aeebd269c9c..e2c70a04cf0e6fe243a3faf93494d342c47f055b 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -84,7 +84,6 @@
 
 /* MMC */
 #if defined(CONFIG_ZYNQ_SDHCI)
-# define CONFIG_GENERIC_MMC
 # define CONFIG_ZYNQ_SDHCI_MAX_FREQ    52000000
 #endif
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 37ce51a77f4f55637d8cf91bbe8606bd24cdf935..d21589bc2b1129ba3b992f417071e3d2f7f86bd1 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1295,7 +1295,6 @@ CONFIG_GATEWAYIP
 CONFIG_GCOV_KERNEL
 CONFIG_GCOV_PROFILE_ALL
 CONFIG_GENERIC_ATMEL_MCI
-CONFIG_GENERIC_MMC
 CONFIG_GICV2
 CONFIG_GICV3
 CONFIG_GLOBAL_DATA_NOT_REG10