nylon update:

- formally added mtx-3 architecture
- pptp support in the linux kernel

1 files changed, 134 insertions, 73 deletions

diff --git a/packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2 b/packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2
index fb8c033e09..55b05b57a2 100644
--- a/packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2
+++ b/packages/linux/linux-mtx-2-2.4.27/defconfig-mtx-2
@@ -311,13 +311,15 @@ CONFIG_SYN_COOKIES=y
 #
 #   IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_CT_PROTO_GRE=m
+CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
@@ -332,29 +334,31 @@ CONFIG_IP_NF_MATCH_LENGTH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=m
 CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=y
-CONFIG_IP_NF_MATCH_CONNTRACK=y
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_MIRROR=m
-CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_NAT_AMANDA=m
 # CONFIG_IP_NF_NAT_LOCAL is not set
+CONFIG_IP_NF_NAT_PPTP=m 
+CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_NAT_FTP=m
 CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=y
-CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_ARPTABLES=m
@@ -1212,67 +1216,124 @@ CONFIG_USB_LCD=m
 # CONFIG_USB_GADGET is not set
 
 #
-# USB clients (devices, not hosts)
-#
-CONFIG_USBD=m
-# CONFIG_USBD_HIGH_SPEED is not set
-# CONFIG_USBD_NO_SERIAL_NUMBER is not set
-CONFIG_USBD_SERIAL_NUMBER_STR=""
-CONFIG_USBD_MAXPOWER=0
-CONFIG_USBD_PROCFS=y
-CONFIG_USBD_PROCFSM=m
-
-#
-# Network Function
-#
-CONFIG_USBD_NETWORK=m
-CONFIG_USBD_NETWORK_VENDORID=12b9
-CONFIG_USBD_NETWORK_PRODUCTID=f001
-CONFIG_USBD_NETWORK_BCDDEVICE=0100
-CONFIG_USBD_NETWORK_MANUFACTURER="Belcarra"
-## CONFIG_USBD_NETWORK_PRODUCT_NAME="Belcarra BLAN Device"
-## CONFIG_USBD_NETWORK_BLAN=y
-## CONFIG_USBD_NETWORK_BLAN_DESC="BLAN Net Cfg"
-## CONFIG_USBD_NETWORK_BLAN_INTF="Comm/Data Intf"
-# CONFIG_USBD_NETWORK_BLAN_CRC is not set
-# CONFIG_USBD_NETWORK_BLAN_DO_NOT_SETTIME is not set
-# CONFIG_USBD_NETWORK_BLAN_HOSTNAME is not set
-# CONFIG_USBD_NETWORK_BLAN_NOBRIDGE is not set
-CONFIG_USBD_NETWORK_SAFE=y
-CONFIG_USBD_NETWORK_SAFE_NOBRIDGE=y
-# CONFIG_USBD_NETWORK_CDC is not set
-# CONFIG_USBD_NETWORK_BASIC is not set
-# CONFIG_USBD_NETWORK_BASIC2 is not set
-# CONFIG_USBD_NETWORK_START_SINGLE is not set
-# CONFIG_USBD_NETWORK_EP0TEST is not set
-
-#
-# CDC ACM Function
-#                 
-CONFIG_USBD_ACM=m
-CONFIG_USBD_ACM_VENDORID=12b9
-CONFIG_USBD_ACM_PRODUCTID=f002
-CONFIG_USBD_ACM_BCDDEVICE=0100
-CONFIG_USBD_ACM_MANUFACTURER="Belcarra"
-CONFIG_USBD_ACM_PRODUCT_NAME="Belcarra ACM Device"
-CONFIG_USBD_ACM_DESC="Acm Cfg"
-CONFIG_USBD_ACM_COMM_INTF="Comm Intf"
-CONFIG_USBD_ACM_DATA_INTF="Data Intf"
-# CONFIG_USBD_ACM_TRACE is not set
-
-#
-# Random Mouse Function
-#
-# CONFIG_USBD_MOUSE is not set
-
-#
-# AMD AU1X000 Bus Interface
-#
-CONFIG_USBD_AU1X00_BUS=m
-CONFIG_USBD_AU1X00_SCLOCK=400
-CONFIG_AU1000_USB_DEVICE=y
-CONFIG_AU1X00_USB_DEVICE=y
-# CONFIG_USBD_BI_REGISTER_TRACE is not set
+# On-The-Go and USB Peripheral Support
+#
+CONFIG_OTG=m
+
+#
+# Select Hardware
+#
+
+#
+# DB1550 Development Board
+#
+CONFIG_OTG_DB1550=m
+CONFIG_OTG_AU1X00_SCLOCK=400
+# CONFIG_AU1000_USB_DEVICE is not set
+# CONFIG_AU1X00_USB_DEVICE is not set
+CONFIG_OTG_PLATFORM_USBD=y
+CONFIG_OTG_AU1550=m
+CONFIG_OTG_DB1550_J14=y
+# CONFIG_OTG_DB1550_J15 is not set
+# CONFIG_OTG_PLATFORM_OTG is not set
+CONFIG_OTG_PLATFORM_USBD=y
+# CONFIG_OTG_MAX3353E is not set
+CONFIG_OTG_AU1550_DB1550_TR=m
+
+#
+# AMD AU1X00 Bus Interface
+#
+# CONFIG_OTG_AU1X00 is not set
+
+#
+# General Support Options
+#
+# CONFIG_OTG_HIGH_SPEED is not set
+CONFIG_OTG_TRACE=y
+CONFIG_OTG_PROCFSM=m
+# CONFIG_OTG_NOC99 is not set
+
+#
+# Targeted Peripherals (USB Peripheral Function Drivers)
+#
+
+#
+# USB Peripheral Function Driver - CDC ACM
+#
+CONFIG_OTG_ACM=m
+CONFIG_OTG_ACM_VENDORID=15ec
+CONFIG_OTG_ACM_PRODUCTID=f001
+CONFIG_OTG_ACM_BCDDEVICE=0100
+CONFIG_OTG_ACM_MANUFACTURER="Belcarra"
+CONFIG_OTG_ACM_PRODUCT_NAME="Belcarra ACM Device"
+CONFIG_OTG_ACM_DESC="Acm Cfg"
+CONFIG_OTG_ACM_COMM_INTF="Comm Intf"
+CONFIG_OTG_ACM_DATA_INTF="Data Intf"
+
+#
+# USB Peripheral Function Driver - Random Mouse
+#
+# CONFIG_OTG_MOUSE is not set
+
+#
+# USB Peripheral Function Driver - Network
+#
+CONFIG_OTG_NETWORK=m
+CONFIG_OTG_NETWORK_VENDORID=15ec
+CONFIG_OTG_NETWORK_PRODUCTID=f001
+CONFIG_OTG_NETWORK_BCDDEVICE=0100
+CONFIG_OTG_NETWORK_MANUFACTURER="Belcarra"
+CONFIG_OTG_NETWORK_PRODUCT_NAME="Belcarra BLAN Device"
+CONFIG_OTG_NETWORK_BLAN=y
+# CONFIG_OTG_NETWORK_SAFE is not set
+# CONFIG_OTG_NETWORK_CDC is not set
+# CONFIG_OTG_NETWORK_BASIC is not set
+# CONFIG_OTG_NETWORK_BASIC2 is not set
+# CONFIG_OTG_NETWORK_EEM is not set
+
+#
+# MBLM-BLAN Networking Configuration
+#
+CONFIG_OTG_NETWORK_BLAN_DESC="BLAN Net Cfg"
+CONFIG_OTG_NETWORK_BLAN_INTF="Comm/Data Intf"
+CONFIG_OTG_NETWORK_BLAN_CRC=y
+# CONFIG_OTG_NETWORK_BLAN_PADBEFORE is not set
+# CONFIG_OTG_NETWORK_BLAN_PADAFTER is not set
+# CONFIG_OTG_NETWORK_BLAN_FERMAT is not set
+# CONFIG_OTG_NETWORK_BLAN_DO_NOT_SETTIME is not set
+# CONFIG_OTG_NETWORK_BLAN_HOSTNAME is not set
+CONFIG_OTG_NETWORK_BLAN_NONBRIDGED=y
+# CONFIG_OTG_NETWORK_BLAN_DATA_NOTIFY_OK is not set
+CONFIG_OTG_NETWORK_BLAN_PADBYTES=8
+CONFIG_OTG_NETWORK_BLAN_INTERVAL=4
+# CONFIG_OTG_NETWORK_BLAN_IPADDR is not set
+CONFIG_OTG_NETWORK_BLAN_AUTO_CONFIG=y
+# CONFIG_OTG_NETWORK_START_SINGLE is not set
+# CONFIG_OTG_NETWORK_EP0TEST is not set
+# CONFIG_OTG_NETWORK_HOTPLUG is not set
+
+#
+# Mass Storage Function 
+#
+# CONFIG_OTG_MSC is not set
+
+#
+# Traditional Device Options
+#
+CONFIG_OTG_FW_MN=y
+CONFIG_OTG_TR_AUTO=y
+
+#
+# Host configuration (OTG minihost core and HCD)
+#
+
+#
+# OTG Host Controller Driver (HCD)
+#
+# CONFIG_OTG_HCD is not set
+CONFIG_OTG_ROOTHUB_VENDORID=15ec
+CONFIG_OTG_ROOTHUB_PRODUCTID=f010
+CONFIG_OTG_ROOTHUB_BCDDEVICE=0100
 
 #
 # Bluetooth support