* refresh storm patches * disable BX in uClibc config, add ethernet and watchdog support -- thanks to Zilvinas Valinskas

SVN-Revision: 11367

1 files changed, 14 insertions, 6 deletions

diff --git a/target/linux/storm/config-default b/target/linux/storm/config-default
index f74bfc4..8bfef359 100644
--- a/target/linux/storm/config-default
+++ b/target/linux/storm/config-default
@@ -57,7 +57,7 @@ CONFIG_BRIDGE_NETFILTER=y
 # 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_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 init=/etc/preinit mem=32M loglevel=8"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4=y
@@ -159,6 +159,7 @@ CONFIG_IP_NF_MANGLE=m
 # 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_RAW 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
@@ -181,7 +182,6 @@ CONFIG_LLC=m
 # 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_MTD=y
@@ -241,6 +241,7 @@ 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_NETDEV_1000=y
 CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set
@@ -265,7 +266,6 @@ CONFIG_NETFILTER_XTABLES=m
 # 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_NET_ACT_GACT is not set
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_MIRRED is not set
@@ -273,6 +273,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_GMAC=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_KEY is not set
@@ -290,6 +291,8 @@ 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_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
@@ -303,11 +306,12 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PACKET=m
 # CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI=y
+# CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_SYSCALL=y
-# CONFIG_PPP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPP_SYNC_TTY is not set
 CONFIG_PRINTK_TIME=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
@@ -322,7 +326,10 @@ CONFIG_SERIAL_SL2312=y
 CONFIG_SERIAL_SL2312_CONSOLE=y
 # CONFIG_SHMEM 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_TSO is not set
 # CONFIG_SL2312_USB is not set
 CONFIG_SL3516_ASIC=y
 # CONFIG_SMC91X is not set
@@ -341,7 +348,6 @@ CONFIG_TCP_CONG_CUBIC=y
 # 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
@@ -351,6 +357,8 @@ CONFIG_VECTORS_BASE=0xffff0000
 # 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