[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / cavium-octeon / config-default

diff --git a/target/linux/cavium-octeon/config-default b/target/linux/cavium-octeon/config-default
index 560ec73..7fbf456 100644 (file)
--- a/target/linux/cavium-octeon/config-default
+++ b/target/linux/cavium-octeon/config-default
@@ -27,7 +27,6 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BRIDGE is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
@@ -44,11 +43,10 @@ CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 # CONFIG_CGROUP_SCHED is not set
-CONFIG_CMDLINE="console=ttyS0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200"
 # CONFIG_COMEDI is not set
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BRK=y
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CAVIUM_OCTEON=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -79,25 +77,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
@@ -110,7 +89,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set
-CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
@@ -124,7 +102,6 @@ CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVKMEM=y
@@ -142,7 +119,6 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FRAME_WARN=2048
-# CONFIG_FREEZER is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -156,7 +132,6 @@ CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
@@ -235,7 +210,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
@@ -283,7 +258,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
 CONFIG_NLATTR=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=16
@@ -294,10 +268,6 @@ CONFIG_OCTEON_ETHERNET=y
 CONFIG_OCTEON_MGMT=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
@@ -313,17 +283,12 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_POHMELFS is not set
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROM_EMU is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_M48T86=y
 # CONFIG_RTL8187SE is not set
 # CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -372,8 +337,6 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_SMP=y
 # CONFIG_TC35815 is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TIMER_STATS is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_UNEVICTABLE_LRU=y