refresh 2.6.31 patches

[openwrt.git] / target / linux / etrax / config-2.6.30

diff --git a/target/linux/etrax/config-2.6.30 b/target/linux/etrax/config-2.6.30
index 17aeeee..4b26517 100644 (file)
--- a/target/linux/etrax/config-2.6.30
+++ b/target/linux/etrax/config-2.6.30
@@ -1,17 +1,15 @@
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

-CONFIG_BASE_SMALL=0

 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y

-CONFIG_CRIS=y

 # CONFIG_CRIS_MACH_ARTPEC3 is not set
 # CONFIG_CRIS_MACH_ARTPEC3 is not set

+CONFIG_CRIS=y

 # CONFIG_ETRAX100LX is not set
 CONFIG_ETRAX100LX_V2=y
 # CONFIG_ETRAX100LX is not set
 CONFIG_ETRAX100LX_V2=y

-# CONFIG_ETRAXFS is not set

 CONFIG_ETRAX_ARCH_V10=y
 # CONFIG_ETRAX_ARCH_V32 is not set
 CONFIG_ETRAX_AXISFLASHMAP=y
 CONFIG_ETRAX_ARCH_V10=y
 # CONFIG_ETRAX_ARCH_V32 is not set
 CONFIG_ETRAX_AXISFLASHMAP=y


@@ -37,9 +35,10 @@ CONFIG_ETRAX_ETHERNET=y
 CONFIG_ETRAX_FAST_TIMER=y
 CONFIG_ETRAX_FLASH1_SIZE=0
 CONFIG_ETRAX_FLASH_BUSWIDTH=2
 CONFIG_ETRAX_FAST_TIMER=y
 CONFIG_ETRAX_FLASH1_SIZE=0
 CONFIG_ETRAX_FLASH_BUSWIDTH=2

+# CONFIG_ETRAXFS is not set

 CONFIG_ETRAX_GPIO=y
 CONFIG_ETRAX_GPIO=y

-# CONFIG_ETRAX_I2C is not set

 # CONFIG_ETRAX_I2C_GVC is not set
 # CONFIG_ETRAX_I2C_GVC is not set

+# CONFIG_ETRAX_I2C is not set

 # CONFIG_ETRAX_KMALLOCED_MODULES is not set
 CONFIG_ETRAX_LED1G=2
 CONFIG_ETRAX_LED1R=2
 # CONFIG_ETRAX_KMALLOCED_MODULES is not set
 CONFIG_ETRAX_LED1G=2
 CONFIG_ETRAX_LED1R=2


@@ -101,25 +100,23 @@ CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE=y
 # CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set
 CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1
 CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1
 # CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set
 CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1
 CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1

-CONFIG_ETRAX_SERIAL=y

 # CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
 # CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
 # CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
 # CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set

-CONFIG_ETRAX_SERIAL_PORT0=y

 # CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set
 CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
 CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y
 # CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set
 CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
 CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y

+CONFIG_ETRAX_SERIAL_PORT0=y

 # CONFIG_ETRAX_SERIAL_PORT1 is not set
 # CONFIG_ETRAX_SERIAL_PORT1 is not set

-CONFIG_ETRAX_SERIAL_PORT2=y

 CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
 CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
 # CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set
 CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
 CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
 # CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set

-CONFIG_ETRAX_SERIAL_PORT3=y
+CONFIG_ETRAX_SERIAL_PORT2=y

 # CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set
 CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y
 # CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set
 CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y


@@ -128,7 +125,9 @@ CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN=y
 # CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set
 # CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set
 # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set

+CONFIG_ETRAX_SERIAL_PORT3=y

 CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5
 CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5

+CONFIG_ETRAX_SERIAL=y

 # CONFIG_ETRAX_SOFT_SHUTDOWN is not set
 # CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
 # CONFIG_ETRAX_USB_HOST is not set
 # CONFIG_ETRAX_SOFT_SHUTDOWN is not set
 # CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
 # CONFIG_ETRAX_USB_HOST is not set


@@ -146,17 +145,17 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_MLOCK=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_MLOCK=y
 # CONFIG_HW_RANDOM is not set

-# CONFIG_I2C is not set
-CONFIG_MTDRAM_ABS_POS=0
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTDRAM_TOTAL_SIZE=0

 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_MTDRAM=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_MTDRAM=y

+CONFIG_MTDRAM_ABS_POS=0
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTDRAM_TOTAL_SIZE=0

 # CONFIG_NETDEV_1000 is not set
 CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_NETDEV_1000 is not set
 CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

+# CONFIG_PCI is not set

 # CONFIG_RTC is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_RTC is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set