From f9e1d16bfa73a2df5254c63ae1abb6a4bbe0a062 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 20 Sep 2005 06:18:37 +0000
Subject: [PATCH] Add new version of the Zaurus kernel

git-svn-id: https://svn.o-hand.com/repos/poky@25 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../add-elpp-stuff.patch                      |   0
 .../add-oz-release-string.patch               |   0
 .../connectplus-remove-ide-HACK.patch         |   0
 .../defconfig-c7x0                            |   9 +-
 .../defconfig-collie                          |   0
 .../defconfig-ipaq-pxa-2.6                    |   0
 .../defconfig-poodle                          |   0
 .../defconfig-spitz                           |  96 +--
 .../defconfig-tosa                            | 662 +++++++++---------
 .../dtl1_cs-add-socket-revE.patch             |   0
 .../pxa-serial-hack.patch                     |  52 +-
 .../packages/linux/linux-openzaurus.inc       | 104 +++
 .../linux/linux-openzaurus_2.6.13-mm1.bb      | 221 ------
 .../linux/linux-openzaurus_2.6.14-rc1.bb      |  98 +++
 14 files changed, 622 insertions(+), 620 deletions(-)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/add-elpp-stuff.patch (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/add-oz-release-string.patch (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/connectplus-remove-ide-HACK.patch (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-c7x0 (99%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-collie (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-ipaq-pxa-2.6 (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-poodle (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-spitz (95%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/defconfig-tosa (94%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/dtl1_cs-add-socket-revE.patch (100%)
 rename openembedded/packages/linux/{linux-openzaurus-2.6.13-mm1 => linux-openzaurus-2.6.14-rc1}/pxa-serial-hack.patch (58%)
 create mode 100644 openembedded/packages/linux/linux-openzaurus.inc
 delete mode 100644 openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb
 create mode 100644 openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb

diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/add-elpp-stuff.patch
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/add-elpp-stuff.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/add-oz-release-string.patch
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/add-oz-release-string.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/connectplus-remove-ide-HACK.patch
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/connectplus-remove-ide-HACK.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0 b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-c7x0
similarity index 99%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-c7x0
index 542bedc9f6..9dd7c230e7 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-c7x0
@@ -695,15 +695,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-collie
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-collie
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6 b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-ipaq-pxa-2.6
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-ipaq-pxa-2.6
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-poodle
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-poodle
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-spitz
similarity index 95%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-spitz
index e61a999627..f838a497a3 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc5-mm1
-# Sun Aug 28 18:06:14 2005
+# Linux kernel version: 2.6.13-mm3
+# Fri Sep 16 13:04:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -32,6 +33,7 @@ CONFIG_SYSCTL=y
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -97,9 +99,10 @@ CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_PXA_SHARPSL_25x is not set
 CONFIG_PXA_SHARPSL_27x=y
-CONFIG_MACH_SPITZ=y
 CONFIG_MACH_AKITA=y
+CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
+# CONFIG_MACH_TOSA is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_KEYS is not set
 CONFIG_PXA_SHARP_Cxx00=y
@@ -145,7 +148,6 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -155,6 +157,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -162,7 +165,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3   debug"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw   debug"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -217,8 +220,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 
@@ -246,6 +249,7 @@ CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_QUEUE=m
@@ -271,8 +275,10 @@ CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
 CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
 CONFIG_IP_NF_FILTER=m
 # CONFIG_IP_NF_TARGET_REJECT is not set
 CONFIG_IP_NF_TARGET_LOG=m
@@ -295,6 +301,7 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_DSCP is not set
 # CONFIG_IP_NF_TARGET_MARK is not set
 # CONFIG_IP_NF_TARGET_CLASSIFY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
 CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_TARGET_NOTRACK is not set
 CONFIG_IP_NF_ARPTABLES=m
@@ -321,8 +328,10 @@ CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
 # CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_TARGET_MARK is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_RAW=m
 
 #
@@ -432,7 +441,11 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers
@@ -538,7 +551,6 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
 
 #
@@ -581,6 +593,7 @@ CONFIG_IDE_GENERIC=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
 CONFIG_SCSI_PROC_FS=y
 
@@ -608,10 +621,17 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI Transport Layers
+#
+# CONFIG_SAS_CLASS is not set
 
 #
 # SCSI low-level drivers
 #
+# CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 
@@ -696,15 +716,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -848,18 +873,22 @@ CONFIG_SA1100_RTC=y
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
 # Misc devices
 #
 
+#
+# Multimedia Capabilities Port drivers
+#
+
 #
 # SoC drivers
 #
@@ -982,6 +1011,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
 
 #
 # USB Input Devices
@@ -1033,30 +1063,14 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_ZD1201 is not set
 CONFIG_USB_MON=y
 
@@ -1183,11 +1197,8 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-
-#
-# XFS support
-#
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
@@ -1218,13 +1229,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
 # CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1417,6 +1426,7 @@ CONFIG_CRYPTO_TEST=m
 # Library routines
 #
 CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-tosa
similarity index 94%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-tosa
index c7eba4a337..dd1e70fa03 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-tosa
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-mm1
-# Mon Jul  4 15:43:10 2005
+# Linux kernel version: 2.6.13-mm1
+# Tue Sep  6 08:38:08 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options
@@ -23,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -33,6 +33,7 @@ CONFIG_SYSCTL=y
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -86,6 +87,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 
 #
 # Intel PXA2xx Implementations
@@ -95,6 +97,8 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_PXA_IDP is not set
 CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_HX2750 is not set
+CONFIG_PXA_SHARPSL_25x=y
+# CONFIG_PXA_SHARPSL_27x is not set
 # CONFIG_MACH_POODLE is not set
 # CONFIG_MACH_CORGI is not set
 # CONFIG_MACH_SHEPHERD is not set
@@ -145,8 +149,8 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -154,6 +158,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -161,7 +166,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2  "
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -189,6 +194,259 @@ CONFIG_BINFMT_MISC=m
 CONFIG_PM=y
 CONFIG_APM=y
 
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+CONFIG_IP_NF_CT_PROTO_SCTP=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=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_RECENT=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_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
+CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_TOS is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_DSCP is not set
+# CONFIG_IP_NF_TARGET_MARK is not set
+# CONFIG_IP_NF_TARGET_CLASSIFY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_TARGET_NOTRACK is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_LIMIT=m
+CONFIG_IP6_NF_MATCH_MAC=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_MARK=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_LENGTH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_TARGET_MARK is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_RAW=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_NSC_FIR is not set
+# CONFIG_WINBOND_FIR is not set
+# CONFIG_SMC_IRCC_FIR is not set
+# CONFIG_ALI_FIR is not set
+# CONFIG_VIA_FIR is not set
+CONFIG_PXA_FICP=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_BCSP_TXCRC=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+
 #
 # Device Drivers
 #
@@ -294,7 +552,6 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
 
 #
@@ -337,6 +594,7 @@ CONFIG_BLK_DEV_IDECS=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
 CONFIG_SCSI_PROC_FS=y
 
@@ -399,268 +657,19 @@ CONFIG_CHR_DEV_SG=m
 #
 
 #
-# Networking support
+# Network device support
 #
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-
-#
-# TCP congestion control
-#
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=y
-CONFIG_TCP_CONG_HTCP=y
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_PRIVACY is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=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_RECENT=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_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
-CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_FILTER=m
-# CONFIG_IP_NF_TARGET_REJECT is not set
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_DSCP is not set
-# CONFIG_IP_NF_TARGET_MARK is not set
-# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_TARGET_NOTRACK is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IP6_NF_MANGLE=m
-# CONFIG_IP6_NF_TARGET_MARK is not set
-CONFIG_IP6_NF_RAW=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_KGDBOE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-# CONFIG_IRTTY_SIR is not set
-
-#
-# Dongle support
-#
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-# CONFIG_USB_IRDA is not set
-# CONFIG_SIGMATEL_FIR is not set
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_PXA_FICP=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-# CONFIG_BT_HCIUSB_SCO is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
 #
 # Ethernet (10 or 100Mbit)
 #
@@ -741,6 +750,11 @@ CONFIG_PPP_BSDCOMP=m
 # CONFIG_SLIP is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
+# CONFIG_KGDBOE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -773,6 +787,7 @@ CONFIG_KEYBOARD_TOSA=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_CORGI is not set
+CONFIG_KEYBOARD_SPITZ=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -833,7 +848,6 @@ CONFIG_SA1100_RTC=y
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
 
 #
 # PCMCIA character devices
@@ -854,7 +868,7 @@ CONFIG_I2C=y
 #
 # I2C Algorithms
 #
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALGOPCA is not set
 
@@ -863,15 +877,31 @@ CONFIG_I2C=y
 #
 CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
-# CONFIG_I2C_ISA is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
 
 #
-# Hardware Sensors Chip support
+# Miscellaneous I2C Chip support
 #
-# CONFIG_I2C_SENSOR is not set
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -897,33 +927,23 @@ CONFIG_I2C_PXA=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-
-#
-# Other I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
 # Misc devices
 #
 
+#
+# Multimedia Capabilities Port drivers
+#
+
 #
 # SoC drivers
 #
@@ -941,7 +961,6 @@ CONFIG_VIDEO_DEV=m
 #
 # Video Adapters
 #
-# CONFIG_CONFIG_TUNER_MULTI_I2C is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
@@ -1005,6 +1024,11 @@ CONFIG_BACKLIGHT_DEVICE=y
 # CONFIG_BACKLIGHT_CORGI is not set
 CONFIG_BACKLIGHT_TOSA=y
 
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+
 #
 # Sound
 #
@@ -1031,12 +1055,13 @@ CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
 CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_AC97_BUS=m
 
 #
 # ALSA ARM devices
 #
-CONFIG_SND_PXA2XX_AC97=m
 CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_AC97=m
 
 #
 # USB devices
@@ -1073,17 +1098,17 @@ CONFIG_USB_DEVICEFS=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
 
 #
 # USB Device Class drivers
 #
-CONFIG_USB_AUDIO=m
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 
 #
 # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
 #
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 
@@ -1100,6 +1125,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
 
 #
 # USB Input Devices
@@ -1122,8 +1148,11 @@ CONFIG_USB_POWERMATE=m
 CONFIG_USB_MTOUCH=m
 # CONFIG_USB_ITMTOUCH is not set
 CONFIG_USB_EGALAX=m
+# CONFIG_USB_YEALINK is not set
 CONFIG_USB_XPAD=m
 CONFIG_USB_ATI_REMOTE=m
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
 
 #
 # USB Imaging devices
@@ -1153,32 +1182,16 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+# CONFIG_USB_NET_RNDIS is not set
+# CONFIG_USB_NET_SIMPLE is not set
+# CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_USB_ZD1201 is not set
-CONFIG_USB_MON=m
+CONFIG_USB_MON=y
 
 #
 # USB port drivers
@@ -1191,7 +1204,7 @@ CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
 CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 # CONFIG_USB_SERIAL_CP2101 is not set
 CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -1246,6 +1259,7 @@ CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1281,6 +1295,7 @@ CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BULKTRANSFER is not set
 CONFIG_MMC_PXA=y
 # CONFIG_MMC_WBSD is not set
 
@@ -1288,22 +1303,19 @@ CONFIG_MMC_PXA=y
 # File systems
 #
 CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-CONFIG_FS_MBCACHE=y
 # CONFIG_REISER4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 
 #
 # XFS support
 #
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
@@ -1311,11 +1323,6 @@ CONFIG_INOTIFY=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
 CONFIG_FUSE_FS=m
 
 #
@@ -1339,10 +1346,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1353,6 +1357,7 @@ CONFIG_RAMFS=y
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -1540,6 +1545,7 @@ CONFIG_CRYPTO_TEST=m
 # Library routines
 #
 CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/dtl1_cs-add-socket-revE.patch
similarity index 100%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/dtl1_cs-add-socket-revE.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/pxa-serial-hack.patch
similarity index 58%
rename from openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch
rename to openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/pxa-serial-hack.patch
index ee761b75ad..7892a0f929 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.14-rc1/pxa-serial-hack.patch
@@ -1,8 +1,8 @@
-Index: 2.6-bk/drivers/serial/8250.c
+Index: linux-2.6.13/drivers/serial/8250.c
 ===================================================================
---- 2.6-bk.orig/drivers/serial/8250.c	2004-09-15 11:00:58.000000000 +0100
-+++ 2.6-bk/drivers/serial/8250.c	2004-09-30 13:23:22.202968787 +0100
-@@ -2033,7 +2033,12 @@
+--- linux-2.6.13.orig/drivers/serial/8250.c	2005-09-15 09:26:00.000000000 +0100
++++ linux-2.6.13/drivers/serial/8250.c	2005-09-15 09:28:49.000000000 +0100
+@@ -2312,7 +2312,12 @@
  	.devfs_name		= "tts/",
  	.dev_name		= "ttyS",
  	.major			= TTY_MAJOR,
@@ -15,20 +15,20 @@ Index: 2.6-bk/drivers/serial/8250.c
  	.nr			= UART_NR,
  	.cons			= SERIAL8250_CONSOLE,
  };
-Index: 2.6-bk/drivers/serial/serial_core.c
+Index: linux-2.6.13/drivers/serial/serial_core.c
 ===================================================================
---- 2.6-bk.orig/drivers/serial/serial_core.c	2004-09-30 09:03:27.000000000 +0100
-+++ 2.6-bk/drivers/serial/serial_core.c	2004-09-30 13:23:22.205967977 +0100
-@@ -1958,7 +1958,7 @@
- static inline void
- uart_report_port(struct uart_driver *drv, struct uart_port *port)
- {
--	printk("%s%d", drv->dev_name, port->line);
-+	printk("%s%d", drv->dev_name, port->line + drv->name_base);
- 	printk(" at ");
- 	switch (port->iotype) {
- 	case UPIO_PORT:
-@@ -2127,6 +2127,7 @@
+--- linux-2.6.13.orig/drivers/serial/serial_core.c	2005-09-15 09:26:00.000000000 +0100
++++ linux-2.6.13/drivers/serial/serial_core.c	2005-09-15 09:30:16.000000000 +0100
+@@ -1969,7 +1969,7 @@
+ 	}
+ 
+ 	printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
+-	       drv->dev_name, port->line, address, port->irq, uart_type(port));
++	       drv->dev_name, port->line + drv->name_base, address, port->irq, uart_type(port));
+ }
+ 
+ static void
+@@ -2133,6 +2133,7 @@
  	normal->driver_name	= drv->driver_name;
  	normal->devfs_name	= drv->devfs_name;
  	normal->name		= drv->dev_name;
@@ -36,11 +36,11 @@ Index: 2.6-bk/drivers/serial/serial_core.c
  	normal->major		= drv->major;
  	normal->minor_start	= drv->minor;
  	normal->type		= TTY_DRIVER_TYPE_SERIAL;
-Index: 2.6-bk/include/linux/serial_core.h
+Index: linux-2.6.13/include/linux/serial_core.h
 ===================================================================
---- 2.6-bk.orig/include/linux/serial_core.h	2004-09-15 11:00:59.000000000 +0100
-+++ 2.6-bk/include/linux/serial_core.h	2004-09-30 13:23:22.206967707 +0100
-@@ -290,6 +290,7 @@
+--- linux-2.6.13.orig/include/linux/serial_core.h	2005-09-15 09:26:03.000000000 +0100
++++ linux-2.6.13/include/linux/serial_core.h	2005-09-15 09:28:49.000000000 +0100
+@@ -318,6 +318,7 @@
  	const char		*driver_name;
  	const char		*dev_name;
  	const char		*devfs_name;
@@ -48,11 +48,11 @@ Index: 2.6-bk/include/linux/serial_core.h
  	int			 major;
  	int			 minor;
  	int			 nr;
-Index: linux-2.6.11/drivers/serial/serial_cs.c
+Index: linux-2.6.13/drivers/serial/serial_cs.c
 ===================================================================
---- linux-2.6.11.orig/drivers/serial/serial_cs.c	2005-06-13 23:28:12.000000000 +0100
-+++ linux-2.6.11/drivers/serial/serial_cs.c	2005-06-14 00:18:08.000000000 +0100
-@@ -331,7 +331,7 @@
+--- linux-2.6.13.orig/drivers/serial/serial_cs.c	2005-09-15 09:26:00.000000000 +0100
++++ linux-2.6.13/drivers/serial/serial_cs.c	2005-09-15 09:28:49.000000000 +0100
+@@ -298,7 +298,7 @@
  			kio_addr_t iobase, int irq)
  {
  	struct uart_port port;
@@ -61,7 +61,7 @@ Index: linux-2.6.11/drivers/serial/serial_cs.c
  
  	memset(&port, 0, sizeof (struct uart_port));
  	port.iobase = iobase;
-@@ -348,10 +348,16 @@
+@@ -315,10 +315,16 @@
  		return -EINVAL;
  	}
  
diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
new file mode 100644
index 0000000000..68a90b290e
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -0,0 +1,104 @@
+DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
+SECTION = "kernel"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
+LICENSE = "GPL"
+
+DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
+RPSRC = "http://www.rpsys.net/openzaurus/patches"
+JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
+BASRC = "http://www.orca.cx/zaurus/patches"
+
+inherit kernel
+
+##############################################################
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel-image = ""
+ALLOW_EMPTY = 1
+
+EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
+COMPATIBLE_HOST = "arm.*-linux"
+
+CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
+CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
+CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
+CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw "
+
+##############################################################
+# Configure memory/ramdisk split for collie
+#
+export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
+export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
+
+CMDLINE_MEM_collie = "mem=${mem}M"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
+
+###############################################################
+# Enable or disable ELPP via local.conf - default is "no"
+#
+ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+
+###############################################################
+# module configs specific to this kernel
+#
+module_autoload_pxaficp_ir = "pxaficp_ir"
+
+do_configure() {
+
+	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+
+	if [ "${MACHINE}" == "collie" ]; then
+		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+		rdsize=`echo "$rd * 1024" | bc`
+		total=`expr $mem + $rd`
+		addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
+	 	if [ "$rd" == "0" ]
+	 	then
+		    echo "No RAMDISK"
+			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+		else
+		    echo "RAMDIR = $rdsize on $addr"
+			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
+			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
+		fi
+	fi
+
+	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+
+	if [ "${ENABLE_ELPP}" == "yes" ]; then
+                echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
+                echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
+                echo "CONFIG_LOGO=y"                    >> ${S}/.config
+                echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
+	else
+		echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
+	fi
+
+	yes '' | oe_runmake oldconfig
+}
+
+# Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii
+do_compile_append() {
+	case ${MACHINE} in
+		c7x0 | akita | poodle | spitz | borzoi | tosa )
+			size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
+			if [ $size -ge 1271 ]; then	
+				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+				die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
+			fi
+			;;
+        	*)
+			;;
+	esac
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb
deleted file mode 100644
index 3a5284e069..0000000000
--- a/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb
+++ /dev/null
@@ -1,221 +0,0 @@
-DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
-SECTION = "kernel"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
-LICENSE = "GPL"
-#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
-KV = "${@bb.data.getVar('PV',d,True)}"
-
-PR = "r3"
-
-DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
-RPSRC = "http://www.rpsys.net/openzaurus/patches"
-JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
-BASRC = "http://www.orca.cx/zaurus/patches"
-
-# Handy URLs
-# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc5.bz2;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \
-# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \
-
-#           ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \
-#           ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
-#           ${RPSRC}/w100_core-r1.patch;patch=1 \
-#           ${RPSRC}/w100_corgi-r1.patch;patch=1 \
-#           ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \
-#           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_sd-r5.patch;patch=1 \
-#           ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
-#           ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
-#           ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \	   
-#           ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
-#           ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
-#           ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
-#           ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
-#           ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
-
-# Patches submitted upstream are towards top of this list 
-# Hacks should clearly named and at the bottom
-#           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \
-           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
-           ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
-           ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
-           ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
-           ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \
-           ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
-           ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
-           ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
-           ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
-           ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_bl-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-r6.patch;patch=1 \
-           ${RPSRC}/corgi_pm-r1.patch;patch=1 \
-           ${RPSRC}/spitzkbd-r1.patch;patch=1 \
-           ${RPSRC}/spitzcf-r2.patch;patch=1 \
-           ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
-           ${RPSRC}/pxa_irda-r3.patch;patch=1 \
-           ${RPSRC}/corgi_irda-r3.patch;patch=1 \
-           ${RPSRC}/input_power-r2.patch;patch=1 \
-           ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
-           ${RPSRC}/corgi_snd-r10.patch;patch=1 \
-           ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_mtd_extras-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
-           ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
-           ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
-           ${DOSRC}/tc6393-device-r4.patch;patch=1 \
-           ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \
-           ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
-           ${DOSRC}/tc6393fb-r6.patch;patch=1 \
-           ${DOSRC}/tosa-power-r5.patch;patch=1 \
-           ${DOSRC}/tosa-mmc-r3.patch;patch=1 \
-           ${DOSRC}/tosa-udc-r3.patch;patch=1 \
-           ${DOSRC}/tosa-irda-r2.patch;patch=1 \
-           ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
-           ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
-           ${RPSRC}/spitz_base-r11.patch;patch=1 \
-           ${RPSRC}/spitz_pm-r1.patch;patch=1 \
-           ${RPSRC}/scoop_susres-r0.patch;patch=1 \
-           ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
-           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-           file://add-oz-release-string.patch;patch=1 \
-           file://add-elpp-stuff.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1 \
-           ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
-           file://dtl1_cs-add-socket-revE.patch;patch=1 \
-           file://connectplus-remove-ide-HACK.patch;patch=1 \
-           file://defconfig-c7x0 \
-           file://defconfig-ipaq-pxa-2.6 \
-           file://defconfig-collie \
-           file://defconfig-poodle \
-           file://defconfig-spitz \
-           file://defconfig-tosa "
-
-#           ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-#           ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
-#           ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
-
-SRC_URI_append_collie = "${RPSRC}/jl1/collie_keymap.patch;patch=1 "
-SRC_URI_append_poodle = "${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
-                         ${RPSRC}/rpextra_poodle-r0.patch;patch=1 "
-SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
-		       ${DOSRC}/pxa-ac97-alsa-r1.patch;patch=1 \
-		       ${DOSRC}/pxa-ac97-alsa-resume-r0.patch;patch=1 \
-		       ${DOSRC}/ac97-bus-r0.patch;patch=1 \
-		       ${DOSRC}/wm9712-ts-r2.patch;patch=1 \
-                       ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
-        	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
-
-S = "${WORKDIR}/linux-2.6.13"
-
-inherit kernel
-
-##############################################################
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-FILES_kernel-image = ""
-ALLOW_EMPTY = 1
-
-EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
-COMPATIBLE_HOST = "arm.*-linux"
-
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
-CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
-CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
-CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw "
-
-##############################################################
-# Configure memory/ramdisk split for collie
-#
-export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
-export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
-
-CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
-
-###############################################################
-# Enable or disable ELPP via local.conf - default is "no"
-#
-ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
-
-###############################################################
-# module configs specific to this kernel
-#
-module_autoload_pxaficp_ir = "pxaficp_ir"
-
-do_configure() {
-
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-
-	if [ "${MACHINE}" == "collie" ]; then
-		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
-		rdsize=`echo "$rd * 1024" | bc`
-		total=`expr $mem + $rd`
-		addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
-	 	if [ "$rd" == "0" ]
-	 	then
-		    echo "No RAMDISK"
-			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
-		else
-		    echo "RAMDIR = $rdsize on $addr"
-			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
-			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
-		fi
-	fi
-
-	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-
-	if [ "${ENABLE_ELPP}" == "yes" ]; then
-                echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
-                echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
-                echo "CONFIG_LOGO=y"                    >> ${S}/.config
-                echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
-	else
-		echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
-	fi
-
-	yes '' | oe_runmake oldconfig
-}
-
-# Check the kernel is below the 1272*1024 byte limit for the c7x0
-do_compile_append() {
-	if [ "${MACHINE}" == "c7x0" ]; then
-		size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
-		if [ $size -ge 1271 ]; then
-			rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-			die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
-		fi
-	fi
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
new file mode 100644
index 0000000000..28643b8142
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
@@ -0,0 +1,98 @@
+include linux-openzaurus.inc
+
+PR = "r1"
+
+# Handy URLs
+# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
+# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \
+# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \
+# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
+
+# Patches submitted upstream are towards top of this list 
+# Hacks should clearly named and at the bottom
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
+           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \
+           ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \
+           ${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \
+           ${RPSRC}/sharpsl_ts-r6.patch;patch=1 \
+           ${RPSRC}/sharpsl_bl-r5a.patch;patch=1 \
+           ${RPSRC}/spitzkbd-r3.patch;patch=1 \
+           ${RPSRC}/spitz_base-r17.patch;patch=1 \
+           ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	 
+           ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
+           ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
+           ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
+           ${RPSRC}/poodle_irda-r0.patch;patch=1 \
+           ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
+           ${RPSRC}/corgi_pm-r3.patch;patch=1 \
+           ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
+           ${RPSRC}/spitz_pm-r3.patch;patch=1 \
+           ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
+           ${RPSRC}/spitzcf-r3.patch;patch=1 \
+           ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+           ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
+           ${RPSRC}/pxa_irda-r4.patch;patch=1 \
+           ${RPSRC}/corgi_irda-r3.patch;patch=1 \
+           ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
+           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
+           ${RPSRC}/input_power-r2.patch;patch=1 \
+           ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
+           ${RPSRC}/corgi_snd-r10.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
+           ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
+           ${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
+           ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
+           ${DOSRC}/tc6393-device-r5.patch;patch=1 \
+           ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
+           ${DOSRC}/tosa-machine-base-r9.patch;patch=1 \
+           ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
+           ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
+           ${DOSRC}/tosa-power-r6.patch;patch=1 \
+           ${DOSRC}/tosa-mmc-r5.patch;patch=1 \
+           ${DOSRC}/tosa-udc-r4.patch;patch=1 \
+           ${DOSRC}/tosa-irda-r3.patch;patch=1 \
+           ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
+           ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \
+           ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
+           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
+           file://add-oz-release-string.patch;patch=1 \
+           file://add-elpp-stuff.patch;patch=1 \
+           file://pxa-serial-hack.patch;patch=1 \
+           ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
+           file://dtl1_cs-add-socket-revE.patch;patch=1 \
+           file://connectplus-remove-ide-HACK.patch;patch=1 \
+           file://defconfig-c7x0 \
+           file://defconfig-ipaq-pxa-2.6 \
+           file://defconfig-collie \
+           file://defconfig-poodle \
+           file://defconfig-spitz \
+           file://defconfig-tosa "
+
+# These patches would really help collie/poodle but we 
+# need someone to maintain them
+# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#   (Pavel Machek's git tree has updated versions of this?)
+#   Also parts were recently committed to mainline by rmk (drivers/mfd/)
+# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 
+#   (This is mostly in mainline now?)
+# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
+# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
+
+SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
+                       ${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \
+		       ${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \
+                       ${DOSRC}/wm9712-ts-r3.patch;patch=1 \
+                       ${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \
+        	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
+
+S = "${WORKDIR}/linux-2.6.13"