cns3xxx: sync kernel config

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31807 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 22 insertions, 12 deletions

diff --git a/target/linux/cns3xxx/config-default b/target/linux/cns3xxx/config-default
index b6e859d0e5..f53f8cb2b5 100644
--- a/target/linux/cns3xxx/config-default
+++ b/target/linux/cns3xxx/config-default
@@ -1,12 +1,10 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_CNS3XXX=y
-# CONFIG_ARCH_EXYNOS4 is not set
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
-# CONFIG_ARCH_VT8500 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARM=y
 CONFIG_ARM_GIC=y
@@ -15,6 +13,7 @@ CONFIG_ARM_THUMB=y
 CONFIG_ATA=y
 # CONFIG_ATA_SFF is not set
 CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_BCMA_POSSIBLE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=2
 CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -22,6 +21,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CNS3XXX_ETH=y
 CONFIG_CPU_32v6=y
+CONFIG_CPU_32v6K=y
 CONFIG_CPU_ABRT_EV6=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_CACHE_V6=y
@@ -33,12 +33,12 @@ CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_HAS_PMU=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_V6=y
+CONFIG_CPU_RMAP=y
 CONFIG_CPU_TLB_V6=y
-CONFIG_CPU_USE_DOMAINS=y
-CONFIG_CPU_V6=y
+CONFIG_CPU_V6K=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
-CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DMA_CACHE_RWFO=y
 # CONFIG_DWC_DEBUG is not set
 # CONFIG_DWC_DEVICE_ONLY is not set
@@ -46,11 +46,9 @@ CONFIG_DMA_CACHE_RWFO=y
 CONFIG_DWC_OTG_MODE=y
 CONFIG_EEPROM_AT24=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_FSNOTIFY is not set
-CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GPIOLIB=y
@@ -63,6 +61,9 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -73,7 +74,10 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_WORK=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
@@ -105,8 +109,8 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MPCORE_WATCHDOG=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_PHYSMAP=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NLS=y
 CONFIG_NR_CPUS=2
 CONFIG_OUTER_CACHE=y
@@ -122,6 +126,8 @@ CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_769419=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RAID_ATTRS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_SATA_AHCI=y
@@ -138,9 +144,12 @@ CONFIG_SMP_ON_UP=y
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_CNS3XXX=y
+# CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_STAGING is not set
+CONFIG_STOP_MACHINE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_TREE_RCU=y
 CONFIG_UID16=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -156,8 +165,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_G_DBGP is not set
 # CONFIG_USB_G_HID is not set
@@ -170,9 +177,12 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_ZERO is not set
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_XPS=y
+CONFIG_XZ_DEC=y
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZONE_DMA_FLAG=0