sed: upgrade to version 4.2.2

[openwrt/openwrt.git] / target / linux / ep93xx / config-3.3

diff --git a/target/linux/ep93xx/config-3.3 b/target/linux/ep93xx/config-3.3
index f5318d4ef657dc46281cef81c4448e36a6c5dcb3..69c94d37ddddb7df9bd88c7cce767dee2c9fac31 100644 (file)
--- a/target/linux/ep93xx/config-3.3
+++ b/target/linux/ep93xx/config-3.3
@@ -20,7 +20,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_VIC=y
 CONFIG_ARM_VIC_NR=2
 # CONFIG_ARPD is not set
-CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -44,30 +43,7 @@ CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CRC7=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRUNCH=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DNOTIFY=y
+# CONFIG_DEBUG_USER is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ELF_CORE=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
@@ -82,15 +58,6 @@ CONFIG_EP93XX_SDCE0_PHYS_OFFSET=y
 # CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET is not set
 # CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET is not set
 CONFIG_EP93XX_WATCHDOG=y
-CONFIG_FB=y
-# CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_EP93XX=y
-# CONFIG_FB_SM7XX is not set
-# CONFIG_FB_WMT_GE_ROPS is not set
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x11 is not set
@@ -200,13 +167,12 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
-CONFIG_TOUCHSCREEN_EP93XX=y
+# CONFIG_TOUCHSCREEN_EP93XX is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
@@ -223,7 +189,8 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZONE_DMA_FLAG=0