[rdc] resync 2.6.32 support with changes in 2.6.30

[openwrt.git] / target / linux / coldfire / config-default

diff --git a/target/linux/coldfire/config-default b/target/linux/coldfire/config-default
index 07014f3..245cd1c 100644 (file)
--- a/target/linux/coldfire/config-default
+++ b/target/linux/coldfire/config-default
@@ -1,30 +1,25 @@
 # CONFIG_8139TOO is not set
-# CONFIG_ADVANCED is not set
+CONFIG_ADVANCED=y
 # CONFIG_AMIGA is not set
 # CONFIG_APOLLO is not set
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_SUPPORTS_AOUT=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ATARI is not set
-CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BOOTPARAM is not set
 CONFIG_BOUNCE=y
 CONFIG_CFV4E=y
 CONFIG_CLASSIC_RCU=y
-CONFIG_COLDFIRE=y
 # CONFIG_COLDFIRE_EDMA is not set
 # CONFIG_COLDFIRE_WATCHDOG is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_DISCONTIGMEM_MANUAL=y
-CONFIG_FEC_548x=y
+CONFIG_COLDFIRE=y
 CONFIG_FEC_548x_AUTO_NEGOTIATION=y
 CONFIG_FEC_548x_ENABLE_FEC2=y
-# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_FEC_548x=y
 # CONFIG_GENERIC_CLOCKEVENTS is not set
 CONFIG_GENERIC_IOMAP=y
 # CONFIG_GENERIC_TIME is not set
@@ -38,7 +33,6 @@ CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_OPROFILE is not set
 # CONFIG_HP300 is not set
 CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_LEDS_ALIX is not set
@@ -49,8 +43,8 @@ CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_M5475DFE is not set
 # CONFIG_M5475EFE is not set
 # CONFIG_M5475FFE is not set
-# CONFIG_M547X is not set
 CONFIG_M547X_8X=y
+# CONFIG_M547X is not set
 # CONFIG_M5485AFE is not set
 # CONFIG_M5485BFE is not set
 CONFIG_M5485CFE=y
@@ -62,8 +56,8 @@ CONFIG_M548X=y
 # CONFIG_M68030 is not set
 # CONFIG_M68040 is not set
 # CONFIG_M68060 is not set
-CONFIG_M68K=y
 # CONFIG_M68KFPU_EMU is not set
+CONFIG_M68K=y
 # CONFIG_MAC is not set
 CONFIG_MCD_DMA=y
 CONFIG_MCFCLK=200000000
@@ -72,33 +66,28 @@ CONFIG_MCF_USER_HALT=y
 CONFIG_MMU_CFV4E=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NODES_SHIFT=3
-CONFIG_NOR_FLASH_BASE=0xE0000000
 # CONFIG_NO_DMA is not set
 # CONFIG_NO_IOPORT is not set
+CONFIG_NOR_FLASH_BASE=0xE0000000
 CONFIG_PCI_LEGACY=y
-CONFIG_PCI=y
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PROC_HARDWARE is not set
 # CONFIG_Q40 is not set
 # CONFIG_R6040 is not set
-CONFIG_RESOURCES_64BIT=y
+# CONFIG_RMW_INSNS is not set
 # CONFIG_SCSI_DMA is not set
 CONFIG_SDRAM_BASE=0x00000000
 CONFIG_SDRAM_SIZE=0x04000000
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_COLDFIRE is not set
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_COLDFIRE_IRDA is not set
+CONFIG_SERIAL_COLDFIRE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_SERIAL_MCF is not set
+CONFIG_SINGLE_MEMORY_CHUNK=y
 CONFIG_SLABINFO=y
 # CONFIG_SUN3 is not set
 # CONFIG_SUN3X is not set