merge of 655180ca822fd77b58f585a3b13300acdaedb1cb

     and b6b0df140fe53ce37d902d8cc41a838a4abc1b7b

4 files changed, 187 insertions, 24 deletions

diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-akita b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-akita
index 5660c46a2c..3c6d3478b2 100644
--- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-akita
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-akita
@@ -130,6 +130,7 @@ CONFIG_ARCH_PXA_HUSKY=y
 CONFIG_ARCH_PXA_BOXER=y
 CONFIG_ARCH_PXA_SPITZ=y
 CONFIG_ARCH_PXA_AKITA=y
+# CONFIG_ARCH_PXA_BORZOI is not set
 # CONFIG_SPITZ_TR0 is not set
 # CONFIG_SPITZ_TR0_5 is not set
 # CONFIG_ARCH_PXA_TOSA is not set
@@ -230,7 +231,7 @@ CONFIG_PCMCIA=y
 # CONFIG_PCMCIA_CLPS6700 is not set
 # CONFIG_PCMCIA_SA1100 is not set
 CONFIG_PCMCIA_PXA=y
-#CONFIG_PCMCIA_SHARP_SL_2SLOT is not set
+# CONFIG_PCMCIA_SHARP_SL_2SLOT is not set
 
 #
 # MMC device drivers
@@ -426,14 +427,64 @@ CONFIG_INET=y
 #
 #   IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+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=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+# CONFIG_IP_NF_NAT is not set
+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=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPSEC is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_DEBUG is not set
+CONFIG_IPV6_IM=y
+# CONFIG_IPV6_DROP_FAKE_V4MAPPED is not set
+# CONFIG_IPV6_RESTRICTED_DOUBLE_BIND is not set
+CONFIG_IPV6_6TO4_NEXTHOP=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ANYCAST=y
+CONFIG_IPV6_ANYCAST_GROUP=y
+# CONFIG_IPV6_ISATAP is not set
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MLD6_ALL_DONE is not set
+# CONFIG_IPV6_NODEINFO is not set
+
+#
+#   IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+CONFIG_IPV6_IPSEC_TUNNEL=y
+CONFIG_IPV6_IPV6_TUNNEL=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -477,7 +528,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_ETHERTAP is not set
 
 #
@@ -727,6 +778,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
 
 #
 # Character devices
@@ -738,6 +790,9 @@ CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=y
 # CONFIG_SERIAL_CONSOLE is not set
 CONFIG_SERIAL_SL_SERIES=y
+# CONFIG_SL_TS_PRESSURE is not set
+# CONFIG_BOOT_PRESSURE_ON is not set
+# CONFIG_SL_WRITE_TS is not set
 # CONFIG_BLUETOOTH_SL is not set
 CONFIG_KBD_DEV_FILE=y
 # CONFIG_SERIAL_EXTENDED is not set
@@ -891,7 +946,6 @@ CONFIG_JFFS2_LARGE_PARTITION=y
 CONFIG_JFFS2_PROC_FS=y
 CONFIG_JFFS2_NODEMERGE=y
 CONFIG_JFFS2_DYNFRAGTREE=y
-#CONFIG_JFFS2_RESERVED_BLOCKS_BAD=80
 CONFIG_JFFS2_RESERVED_BLOCKS_BAD=20
 CONFIG_CRAMFS=y
 CONFIG_TMPFS=y
@@ -1140,7 +1194,6 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_OHCI_PXA27X=m
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
-# CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
@@ -1309,3 +1362,4 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_DIGESTS is not set
 # CONFIG_CRYPTODEV is not set
 # CONFIG_CRYPTOLOOP is not set
+# CONFIG_FW_LOADER is not set
diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-borzoi b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-borzoi
index dc05a0205e..d0b1ffa1bf 100644
--- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-borzoi
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-borzoi
@@ -426,14 +426,64 @@ CONFIG_INET=y
 #
 #   IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+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=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+# CONFIG_IP_NF_NAT is not set
+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=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPSEC is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_DEBUG is not set
+CONFIG_IPV6_IM=y
+# CONFIG_IPV6_DROP_FAKE_V4MAPPED is not set
+# CONFIG_IPV6_RESTRICTED_DOUBLE_BIND is not set
+CONFIG_IPV6_6TO4_NEXTHOP=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ANYCAST=y
+CONFIG_IPV6_ANYCAST_GROUP=y
+# CONFIG_IPV6_ISATAP is not set
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MLD6_ALL_DONE is not set
+# CONFIG_IPV6_NODEINFO is not set
+
+#
+#   IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+CONFIG_IPV6_IPSEC_TUNNEL=y
+CONFIG_IPV6_IPV6_TUNNEL=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -477,7 +527,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_ETHERTAP is not set
 
 #
@@ -727,6 +777,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
 
 #
 # Character devices
@@ -738,6 +789,9 @@ CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=y
 # CONFIG_SERIAL_CONSOLE is not set
 CONFIG_SERIAL_SL_SERIES=y
+# CONFIG_SL_TS_PRESSURE is not set
+# CONFIG_BOOT_PRESSURE_ON is not set
+# CONFIG_SL_WRITE_TS is not set
 # CONFIG_BLUETOOTH_SL is not set
 CONFIG_KBD_DEV_FILE=y
 # CONFIG_SERIAL_EXTENDED is not set
@@ -1139,7 +1193,6 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_OHCI_PXA27X=m
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
-# CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
@@ -1308,3 +1361,4 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_DIGESTS is not set
 # CONFIG_CRYPTODEV is not set
 # CONFIG_CRYPTOLOOP is not set
+# CONFIG_FW_LOADER is not set
diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-spitz b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-spitz
index fb841c48eb..64e2610c12 100644
--- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-spitz
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602/defconfig-spitz
@@ -129,6 +129,7 @@ CONFIG_ARCH_PXA_SHEPHERD=y
 CONFIG_ARCH_PXA_HUSKY=y
 CONFIG_ARCH_PXA_BOXER=y
 CONFIG_ARCH_PXA_SPITZ=y
+# CONFIG_ARCH_PXA_BORZOI is not set
 # CONFIG_SPITZ_TR0 is not set
 # CONFIG_SPITZ_TR0_5 is not set
 # CONFIG_ARCH_PXA_TOSA is not set
@@ -425,14 +426,64 @@ CONFIG_INET=y
 #
 #   IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+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=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+# CONFIG_IP_NF_NAT is not set
+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=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_IPSEC is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_DEBUG is not set
+CONFIG_IPV6_IM=y
+# CONFIG_IPV6_DROP_FAKE_V4MAPPED is not set
+# CONFIG_IPV6_RESTRICTED_DOUBLE_BIND is not set
+CONFIG_IPV6_6TO4_NEXTHOP=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ANYCAST=y
+CONFIG_IPV6_ANYCAST_GROUP=y
+# CONFIG_IPV6_ISATAP is not set
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MLD6_ALL_DONE is not set
+# CONFIG_IPV6_NODEINFO is not set
+
+#
+#   IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+CONFIG_IPV6_IPSEC_TUNNEL=y
+CONFIG_IPV6_IPV6_TUNNEL=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -476,7 +527,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_ETHERTAP is not set
 
 #
@@ -726,6 +777,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
 
 #
 # Character devices
@@ -737,6 +789,9 @@ CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=y
 # CONFIG_SERIAL_CONSOLE is not set
 CONFIG_SERIAL_SL_SERIES=y
+# CONFIG_SL_TS_PRESSURE is not set
+# CONFIG_BOOT_PRESSURE_ON is not set
+# CONFIG_SL_WRITE_TS is not set
 # CONFIG_BLUETOOTH_SL is not set
 CONFIG_KBD_DEV_FILE=y
 # CONFIG_SERIAL_EXTENDED is not set
@@ -1138,7 +1193,6 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_OHCI_PXA27X=m
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
-# CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
@@ -1307,3 +1361,4 @@ CONFIG_ZLIB_DEFLATE=y
 # CONFIG_DIGESTS is not set
 # CONFIG_CRYPTODEV is not set
 # CONFIG_CRYPTOLOOP is not set
+# CONFIG_FW_LOADER is not set
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index f35d5ec5ac..5afdcc876d 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
 PV = "2.4.20-rmk2-embedix"
 LICENSE = "GPL"
 KV = "2.4.20"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \
            file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \