[adm5120] do not overrid CONFIG_BRIDGE (#5163)

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

diff --git a/target/linux/storm/config-default b/target/linux/storm/config-default
index f74bfc4..36f2519 100644 (file)
--- a/target/linux/storm/config-default
+++ b/target/linux/storm/config-default
@@ -1,43 +1,10 @@
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y

-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set

 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_H720X is not set

 # 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_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set

 CONFIG_ARCH_SL2312=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SL2312=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set

-# CONFIG_ARCH_VERSATILE is not set

 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set


@@ -45,20 +12,15 @@ CONFIG_ARM=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y

-# CONFIG_BLK_DEV is not set

 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y

-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=y

 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BSD_PROCESS_ACCT is not set

-# CONFIG_BT is not set

 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CIFS is not set
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CIFS is not set
 # CONFIG_CLS_U32_PERF is not set

-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttySL0,19200 init=/etc/preinit mem=32M loglevel=8"
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M"

 CONFIG_CPU_32=y
 CONFIG_CPU_32v4=y
 CONFIG_CPU_ABRT_EV4=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4=y
 CONFIG_CPU_ABRT_EV4=y


@@ -74,7 +36,6 @@ CONFIG_CPU_FA_BTB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_FA=y
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_FA=y
 # CONFIG_CRC_ITU_T is not set

-# CONFIG_CRYPTO is not set

 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set


@@ -96,7 +57,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_DEFAULT_NOOP=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_DEFAULT_NOOP=y

-CONFIG_DEFAULT_TCP_CONG="cubic"

 # CONFIG_DETECT_SOFTLOCKUP is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 # CONFIG_DETECT_SOFTLOCKUP is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set


@@ -138,7 +98,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set

-CONFIG_INET_XFRM_MODE_BEET=y

 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_TUNNEL is not set


@@ -146,28 +105,6 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_IPSEC_NAT_TRAVERSAL is not set
 # CONFIG_IPV6 is not set
 CONFIG_IP_MROUTE=y
 # CONFIG_IPSEC_NAT_TRAVERSAL is not set
 # CONFIG_IPV6 is not set
 CONFIG_IP_MROUTE=y

-# CONFIG_IP_NF_ARPTABLES is not set
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ISDN is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ISDN is not set


@@ -176,96 +113,25 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_JFFS2_SUMMARY is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_JFFS2_SUMMARY is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set

-CONFIG_KMOD=y
-CONFIG_LLC=m

 # CONFIG_LLC2 is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_LLC2 is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_MINIX_FS is not set

-# CONFIG_MINI_FO is not set

 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MSDOS_FS is not set

-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y

 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y

-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set

 CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_CFI_GEOMETRY=y

-CONFIG_MTD_CFI_I1=y

 # CONFIG_MTD_CFI_I2 is not set
 # CONFIG_MTD_CFI_I2 is not set

-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set

 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_CFI_INTELEXT is not set

-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set

 # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
 # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

 # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
 # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set

-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1

 CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set

-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set

 # CONFIG_MTD_SERIAL is not set
 CONFIG_MTD_SL2312_CFI=y
 # CONFIG_MTD_SL2312_SERIAL_ATMEL is not set
 # CONFIG_MTD_SL2312_SERIAL_ST is not set
 # CONFIG_MTD_SERIAL is not set
 CONFIG_MTD_SL2312_CFI=y
 # CONFIG_MTD_SL2312_SERIAL_ATMEL is not set
 # CONFIG_MTD_SL2312_SERIAL_ST is not set

-# CONFIG_MTD_SLRAM is not set
-CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_PORTSCAN is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CHAOS is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_DELUDE is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETDEV_1000=y

 # CONFIG_NET_ACT_GACT is not set
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_GACT is not set
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_MIRRED is not set


@@ -273,6 +139,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_EMATCH is not set

+CONFIG_NET_GMAC=y

 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_KEY is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_KEY is not set


@@ -290,12 +157,13 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set

+# CONFIG_NET_SL2312 is not set
+CONFIG_NET_SL351X=y

 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set

-# CONFIG_NF_CONNTRACK is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
+CONFIG_NF_CONNTRACK=y

 # CONFIG_NLS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NLS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set


@@ -303,16 +171,14 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PACKET=m
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PACKET=m
 # CONFIG_PARTITION_ADVANCED is not set

-# CONFIG_PCIPCWATCHDOG is not set

 CONFIG_PCI=y
 CONFIG_PCI=y

+# CONFIG_PCIPCWATCHDOG is not set

 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_SYSCALL=y

-# CONFIG_PPP is not set
-CONFIG_PRINTK_TIME=y
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPP_SYNC_TTY is not set

 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set

-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y

 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCSI is not set


@@ -320,28 +186,22 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_SL2312=y
 CONFIG_SERIAL_SL2312_CONSOLE=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_SL2312=y
 CONFIG_SERIAL_SL2312_CONSOLE=y

-# CONFIG_SHMEM is not set

 # CONFIG_SL2312_LPC is not set
 # CONFIG_SL2312_LPC is not set

+# CONFIG_SL2312_MPAGE is not set
+# CONFIG_SL2312_RECVFILE is not set

 # CONFIG_SL2312_SHARE_PIN is not set
 # CONFIG_SL2312_SHARE_PIN is not set

+# CONFIG_SL2312_TSO is not set

 # CONFIG_SL2312_USB is not set
 CONFIG_SL3516_ASIC=y
 # CONFIG_SMC91X is not set
 # CONFIG_SL2312_USB is not set
 CONFIG_SL3516_ASIC=y
 # CONFIG_SMC91X is not set

-# CONFIG_SOFT_WATCHDOG is not set

 # CONFIG_SOUND is not set
 # CONFIG_SOUND is not set

-# CONFIG_SPARSEMEM_STATIC is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_STANDALONE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_STANDALONE is not set

-# CONFIG_SWAP is not set
-# CONFIG_SYN_COOKIES is not set

 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_SYSVIPC is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_SYSVIPC is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y

 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_TIMER_STATS is not set

-CONFIG_TINY_SHMEM=y
-# CONFIG_TUN is not set

 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 # CONFIG_USB_SUPPORT is not set


@@ -351,6 +211,8 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_VLAN_8021Q=m

+# CONFIG_W1 is not set
+CONFIG_WATCHDOG_SL351X=y

 # CONFIG_WLAN_80211 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set