Selaa lähdekoodia

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>
Masahiro Yamada 7 vuotta sitten
vanhempi
commit
54925327fa
100 muutettua tiedostoa jossa 7 lisäystä ja 167 poistoa
  1. 0 3
      README
  2. 2 1
      configs/blanche_defconfig
  3. 1 0
      configs/sandbox_noblk_defconfig
  4. 0 2
      doc/README.atmel_mci
  5. 0 3
      doc/README.socfpga
  6. 4 0
      drivers/mmc/Kconfig
  7. 0 1
      include/configs/BSC9132QDS.h
  8. 0 2
      include/configs/MPC8308RDB.h
  9. 0 1
      include/configs/MPC837XEMDS.h
  10. 0 1
      include/configs/MPC837XERDB.h
  11. 0 1
      include/configs/MPC8536DS.h
  12. 0 1
      include/configs/MPC8569MDS.h
  13. 0 1
      include/configs/P1010RDB.h
  14. 0 1
      include/configs/P1022DS.h
  15. 0 1
      include/configs/P2041RDB.h
  16. 0 1
      include/configs/T102xQDS.h
  17. 0 1
      include/configs/T102xRDB.h
  18. 0 1
      include/configs/T1040QDS.h
  19. 0 1
      include/configs/T104xRDB.h
  20. 0 1
      include/configs/T208xQDS.h
  21. 0 1
      include/configs/T208xRDB.h
  22. 0 1
      include/configs/T4240QDS.h
  23. 0 1
      include/configs/T4240RDB.h
  24. 0 1
      include/configs/UCP1020.h
  25. 0 1
      include/configs/adp-ag101p.h
  26. 0 1
      include/configs/advantech_dms-ba16.h
  27. 0 2
      include/configs/alt.h
  28. 0 1
      include/configs/am3517_crane.h
  29. 0 3
      include/configs/am3517_evm.h
  30. 0 1
      include/configs/apalis_imx6.h
  31. 0 3
      include/configs/apalis_t30.h
  32. 0 1
      include/configs/apf27.h
  33. 0 1
      include/configs/at91sam9260ek.h
  34. 0 1
      include/configs/at91sam9263ek.h
  35. 0 1
      include/configs/at91sam9m10g45ek.h
  36. 0 1
      include/configs/at91sam9n12ek.h
  37. 0 1
      include/configs/at91sam9rlek.h
  38. 0 1
      include/configs/at91sam9x5ek.h
  39. 0 1
      include/configs/atngw100.h
  40. 0 1
      include/configs/atngw100mkii.h
  41. 0 1
      include/configs/atstk1002.h
  42. 0 5
      include/configs/axs10x.h
  43. 0 2
      include/configs/bayleybay.h
  44. 0 2
      include/configs/bcm23550_w1d.h
  45. 0 2
      include/configs/bcm28155_ap.h
  46. 0 3
      include/configs/beaver.h
  47. 0 1
      include/configs/bf518f-ezbrd.h
  48. 0 1
      include/configs/bf527-ad7160-eval.h
  49. 0 3
      include/configs/bf537-stamp.h
  50. 0 1
      include/configs/bf548-ezkit.h
  51. 0 1
      include/configs/bf609-ezkit.h
  52. 0 2
      include/configs/blanche.h
  53. 0 1
      include/configs/brppt1.h
  54. 0 1
      include/configs/brxre1.h
  55. 0 3
      include/configs/cardhu.h
  56. 0 3
      include/configs/cei-tk1-som.h
  57. 0 1
      include/configs/clearfog.h
  58. 0 1
      include/configs/cm-bf537e.h
  59. 0 1
      include/configs/cm-bf537u.h
  60. 0 2
      include/configs/cm_t35.h
  61. 0 2
      include/configs/cm_t3517.h
  62. 0 1
      include/configs/colibri_imx6.h
  63. 0 3
      include/configs/colibri_t20.h
  64. 0 3
      include/configs/colibri_t30.h
  65. 0 2
      include/configs/colibri_vf.h
  66. 0 2
      include/configs/conga-qeval20-qa3-e3845.h
  67. 0 2
      include/configs/controlcenterd.h
  68. 0 1
      include/configs/corenet_ds.h
  69. 0 2
      include/configs/crownbay.h
  70. 0 1
      include/configs/cyrus.h
  71. 0 5
      include/configs/da850evm.h
  72. 0 3
      include/configs/dalmore.h
  73. 0 1
      include/configs/db-88f6820-gp.h
  74. 0 2
      include/configs/dfi-bt700.h
  75. 0 3
      include/configs/dragonboard410c.h
  76. 0 3
      include/configs/e2220-1170.h
  77. 0 1
      include/configs/ethernut5.h
  78. 0 1
      include/configs/exynos-common.h
  79. 0 3
      include/configs/galileo.h
  80. 0 1
      include/configs/ge_bx50v3.h
  81. 0 1
      include/configs/gose.h
  82. 0 3
      include/configs/harmony.h
  83. 0 1
      include/configs/hikey.h
  84. 0 2
      include/configs/hrcon.h
  85. 0 5
      include/configs/imx27lite-common.h
  86. 0 3
      include/configs/jetson-tk1.h
  87. 0 3
      include/configs/k2g_evm.h
  88. 0 6
      include/configs/kc1.h
  89. 0 1
      include/configs/koelsch.h
  90. 0 2
      include/configs/lager.h
  91. 0 3
      include/configs/legoev3.h
  92. 0 1
      include/configs/ls1012aqds.h
  93. 0 1
      include/configs/ls1012ardb.h
  94. 0 1
      include/configs/ls1021aiot.h
  95. 0 1
      include/configs/ls1021aqds.h
  96. 0 1
      include/configs/ls1021atwr.h
  97. 0 1
      include/configs/ls1043a_common.h
  98. 0 1
      include/configs/ls1046a_common.h
  99. 0 1
      include/configs/ls2080a_simu.h
  100. 0 1
      include/configs/ls2080aqds.h

+ 0 - 3
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.
 

+ 2 - 1
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

+ 1 - 0
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

+ 0 - 2
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

+ 0 - 3
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

+ 4 - 0
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

+ 0 - 1
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
 

+ 0 - 2
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
 
 /*

+ 0 - 1
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
 
 /*

+ 0 - 1
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
 
 /*

+ 0 - 1
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
 
 /*

+ 0 - 1
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
 
 /*

+ 0 - 1
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
 

+ 0 - 1
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
 

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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
 

+ 0 - 1
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 */

+ 0 - 1
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
 

+ 0 - 1
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
 
 /*

+ 0 - 1
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) || \

+ 0 - 1
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
 

+ 0 - 1
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 */

+ 0 - 1
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

+ 0 - 1
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 */

+ 0 - 2
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

+ 0 - 1
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

+ 0 - 3
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

+ 0 - 1
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
 

+ 0 - 3
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 + \

+ 0 - 1
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
 

+ 0 - 1
include/configs/at91sam9260ek.h

@@ -145,7 +145,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
include/configs/at91sam9263ek.h

@@ -103,7 +103,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
include/configs/at91sam9m10g45ek.h

@@ -98,7 +98,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
include/configs/at91sam9n12ek.h

@@ -122,7 +122,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
include/configs/at91sam9rlek.h

@@ -105,7 +105,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
include/configs/at91sam9x5ek.h

@@ -110,7 +110,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #endif
 

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 5
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
  */

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 3
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)

+ 0 - 1
include/configs/bf518f-ezbrd.h

@@ -128,7 +128,6 @@
  * SDH Settings
  */
 #if !defined(__ADSPBF512__)
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 #endif
 

+ 0 - 1
include/configs/bf527-ad7160-eval.h

@@ -115,7 +115,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

+ 0 - 3
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

+ 0 - 1
include/configs/bf548-ezkit.h

@@ -142,7 +142,6 @@
  * SDH Settings
  */
 #if !defined(__ADSPBF544__)
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 #endif
 

+ 0 - 1
include/configs/bf609-ezkit.h

@@ -126,7 +126,6 @@
 /*
  * SDH Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BFIN_SDH
 
 /*

+ 0 - 2
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

+ 0 - 1
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 */
 

+ 0 - 1
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 */

+ 0 - 3
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)

+ 0 - 3
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)

+ 0 - 1
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 */

+ 0 - 1
include/configs/cm-bf537e.h

@@ -118,7 +118,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

+ 0 - 1
include/configs/cm-bf537u.h

@@ -116,7 +116,6 @@
 /*
  * SPI_MMC Settings
  */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SPI
 
 /*

+ 0 - 2
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

+ 0 - 2
include/configs/cm_t3517.h

@@ -87,8 +87,6 @@
 
 #define CONFIG_OMAP_GPIO
 
-#define CONFIG_GENERIC_MMC
-
 /* USB */
 #define CONFIG_USB_MUSB_AM35X
 

+ 0 - 1
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
 

+ 0 - 3
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

+ 0 - 3
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 + \

+ 0 - 2
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 */

+ 0 - 2
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
 

+ 0 - 2
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
 

+ 0 - 1
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 */

+ 0 - 2
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

+ 0 - 1
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
 
 /*

+ 0 - 5
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

+ 0 - 3
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

+ 0 - 1
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
 
 /*

+ 0 - 2
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
 

+ 0 - 3
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,

+ 0 - 3
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

+ 0 - 1
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

+ 0 - 1
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 */

+ 0 - 3
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

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 3
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

+ 0 - 1
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

+ 0 - 2
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
 

+ 0 - 5
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
  */

+ 0 - 3
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)

+ 0 - 3
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"

+ 0 - 6
include/configs/kc1.h

@@ -84,12 +84,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-/*
- * MMC
- */
-
-#define CONFIG_GENERIC_MMC
-
 /*
  * Power
  */

+ 0 - 1
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 */

+ 0 - 2
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

+ 0 - 3
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
 

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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

+ 0 - 1
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)

+ 0 - 1
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)

+ 0 - 1
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  */

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä