[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

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

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index 795e200..be0a64f 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -27,11 +27,9 @@ CONFIG_BITREVERSE=y
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_DISKLABEL is not set

-# CONFIG_BT is not set

 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"

-# CONFIG_CONFIGFS_FS is not set

 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y


@@ -44,9 +42,6 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set

-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m

 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y


@@ -96,10 +91,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_IOP3XX is not set
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_IOP3XX is not set

-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set

 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTEL_IOP_ADMA=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTEL_IOP_ADMA=y


@@ -140,7 +131,6 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y
 # CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_MT20XX=m


@@ -161,7 +151,6 @@ CONFIG_NET_DMA=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set

-# CONFIG_NEW_LEDS is not set

 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set


@@ -192,16 +181,11 @@ CONFIG_RTC_DRV_X1205=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

-# CONFIG_SHMEM is not set

 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set

-# CONFIG_SOUND is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-# CONFIG_SWAP is not set

 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set

-CONFIG_TINY_SHMEM=y
-# CONFIG_TUN is not set

 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set


@@ -231,9 +215,6 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m

-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m

 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set