move common CONFIG_MMC entries to generic

SVN-Revision: 17948

diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index e48fceca40be5ca46027776fdbdd6d4329bbbe63..edac29badf3e1d29edbfb1c73f77ff35394b43df 100644 (file)
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -114,12 +114,6 @@ CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_MACH_SWEDATMS is not set
 # CONFIG_MACH_TT9200 is not set
 CONFIG_MACH_VLINK=y
 # CONFIG_MACH_SWEDATMS is not set
 # CONFIG_MACH_TT9200 is not set
 CONFIG_MACH_VLINK=y

-# CONFIG_MMC is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_BLOCK is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MTD_AT91_DATAFLASH=y
 CONFIG_MTD_AT91_PARTS=y
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_AT91_DATAFLASH=y
 CONFIG_MTD_AT91_PARTS=y
 # CONFIG_MTD_CFI is not set

diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default
index 8dea3f004e55eb508cd8897990b60e87f8e9dcc6..b267c94f861b09239ad170c68fa55e6cffa14c84 100644 (file)
--- a/target/linux/avr32/config-default
+++ b/target/linux/avr32/config-default
@@ -58,15 +58,10 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LOAD_ADDRESS=0x10000000
 CONFIG_LOADER_U_BOOT=y
 CONFIG_MACB=y
 CONFIG_LOAD_ADDRESS=0x10000000
 CONFIG_LOADER_U_BOOT=y
 CONFIG_MACB=y

-# CONFIG_MMC_ATMELMCI_DMA is not set
+CONFIG_MMC=m

 CONFIG_MMC_ATMELMCI=m
 CONFIG_MMC_ATMELMCI=m

-CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_ATMELMCI_DMA is not set

 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK=m

-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set

 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index 7d484bc3f704cc3b6d78b38a9c84f678e0539f39..42ab274f7d89a7df809abdcbf37d1a3af0bce4ca 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -723,6 +723,10 @@ CONFIG_MINI_FO=y
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MKISS is not set
 # CONFIG_MMC is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MKISS is not set
 # CONFIG_MMC is not set

+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_PXA is not set

 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 206fa27867fcb4885c2df43d943ef915beb323ab..3ef59eff5c7ba6cb30962ed6752b96003c0568a9 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -805,8 +805,13 @@ CONFIG_MINI_FO=y
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_MKISS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_MKISS is not set

-# CONFIG_MMC_ARMMMCI is not set

 # CONFIG_MMC is not set
 # CONFIG_MMC is not set

+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 8d9eb4abae482206cc9608dcb0eda3f5bb6d37c0..5e98c392a8e762147c66f8420e299461fc637eba 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -938,10 +938,18 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_MISDN_HFCPCI is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set
 # CONFIG_MISDN_HFCPCI is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set

-# CONFIG_MMC_ARMMMCI is not set

 # CONFIG_MMC is not set
 # CONFIG_MMC is not set

+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PCI is not set

 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_TEST is not set

+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_WBSD is not set

 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 973125587dde48d8cc171e6e3803607d59382c9a..86f80a8e2be79b91c66dbafe8ec1f91c92535dc2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -944,8 +944,10 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_MISDN_HFCPCI is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set
 # CONFIG_MISDN_HFCPCI is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set

-# CONFIG_MMC_ARMMMCI is not set

 # CONFIG_MMC is not set
 # CONFIG_MMC is not set

+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y

 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_TEST is not set
 CONFIG_MMU=y
 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_TEST is not set
 CONFIG_MMU=y

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index fdaa764dae0fedc0169736a02c08be62470e3ca7..e3fd0be96007007b123dcc24bab5750290189992 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1083,10 +1083,25 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_HFCUSB is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set
 # CONFIG_MISDN_HFCUSB is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set

-# CONFIG_MMC_ARMMMCI is not set

 # CONFIG_MMC is not set
 # CONFIG_MMC is not set

+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_ATMELMCI is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_BLOCK_PARANOID_RESUME is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_EMBEDDED_SDIO is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_PARANOID_SD_INIT is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PCI is not set

 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_SDRICOH_CS is not set

+# CONFIG_MMC_SPI is not set

 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_TEST is not set

+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_WBSD is not set

 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MMU=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 4a20e4f1ca914e17221dcbe32f5115a59f533875..641a9ba1e9828a365478e934e1589264909eafe2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1103,9 +1103,16 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MKISS is not set
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MKISS is not set
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set

+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y

 # CONFIG_MMC_CB710 is not set
 # CONFIG_MMC_CB710 is not set

+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set

 # CONFIG_MMC_SDRICOH_CS is not set
 # CONFIG_MMC_SDRICOH_CS is not set

+# CONFIG_MMC_SPI is not set

 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_TEST is not set

+# CONFIG_MMC_UNSAFE_RESUME is not set

 # CONFIG_MMC_VIA_SDMMC is not set
 CONFIG_MMU=y
 CONFIG_MODULES=y
 # CONFIG_MMC_VIA_SDMMC is not set
 CONFIG_MMU=y
 CONFIG_MODULES=y

diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index 7831e75b11b4c3579475e8253ac7f7b231d7c4f5..072a2413e6cc6eb2424762c08654997aa8575bce 100644 (file)
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -143,6 +143,7 @@ CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOGO is not set
 CONFIG_MACH_GOLDFISH=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOGO is not set
 CONFIG_MACH_GOLDFISH=y

+# CONFIG_MMC_GOLDFISH is not set

 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y

diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index e1eb498d99ba0c18573daa75a563e7f266ede05b..ee0dfe2f2029ddd6c23013529fbc326f983ca850 100644 (file)
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -103,16 +103,11 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_MACH_SHEEVAPLUG=y
 # CONFIG_MACH_TS219 is not set
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MACH_SHEEVAPLUG=y
 # CONFIG_MACH_TS219 is not set
 CONFIG_MISC_FILESYSTEMS=y

-CONFIG_MMC_BLOCK_BOUNCE=y

 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK=y

-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_MVSDIO=y
 CONFIG_MMC=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_MVSDIO=y

-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MMC=y
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_NAND_ORION=y
 CONFIG_MMC=y
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_NAND_ORION=y

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index f8420458621dceb3166bee9e987bc69281da7414..4ca4bf7598fe7e4d11960dcf0185cc6ae4823690 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -314,13 +314,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI=y

-# CONFIG_MMC_SDHCI_PCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_WBSD is not set

 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y

diff --git a/target/linux/olpc/config-2.6.30 b/target/linux/olpc/config-2.6.30
index 5bedbb50a5438bd5138af7623b9692213ed64970..2f90e3ea5a5b528dfb5ed2b0ea223592e7b688fe 100644 (file)
--- a/target/linux/olpc/config-2.6.30
+++ b/target/linux/olpc/config-2.6.30
@@ -319,13 +319,7 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI=y

-# CONFIG_MMC_SDHCI_PCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_WBSD is not set

 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 5b77fb1d312c7265ca8d30a338c506d3de436397..0673f68f059c2dbe7fb1fccb349e016e868386d8 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -155,8 +155,6 @@ CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set

-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_MVSDIO is not set

 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 CONFIG_MTD_PHYSMAP_LEN=0
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 CONFIG_MTD_PHYSMAP_LEN=0

diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 08083c758de10c65c64ea9dea903ca946ee97f1b..b8d6849aac2155b50822a52fbc0a721b5c2943b3 100644 (file)
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -139,7 +139,6 @@ CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MINIX_FS is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_PXA=y
 CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 CONFIG_MMC_PXA=y
 CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set

diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index c2aa2d562b2488cf2e0db61eba7895356dab71ca..1ec40be5df0c1c49128ec63ffe4e53e7b4c6ffcb 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -238,12 +238,7 @@ CONFIG_MFD_PCF50633=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_S3C=y
 CONFIG_MMC_S3C=y

-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ABSENT=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ABSENT=y
 # CONFIG_MTD_CFI_AMDSTD is not set

diff --git a/target/linux/s3c24xx/config-2.6.31 b/target/linux/s3c24xx/config-2.6.31
index a4f5bcd585631ab32ec13b4fd735d0b6343eec85..dcfddbb21b927cb5f10cbd4faa582292d3046fcf 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.31
+++ b/target/linux/s3c24xx/config-2.6.31
@@ -242,12 +242,6 @@ CONFIG_MFD_PCF50633=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ABSENT=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_ABSENT=y
 # CONFIG_MTD_CFI_AMDSTD is not set