Add KERNEL_VERSION option to select kernel preference for zaurus clamshells. Kill off openzaurus-pxa-2.6 machine type.

BKrev: 420fca1ej6LEvrP_Xe_wpNwLC8AyAQ

27 files changed, 224 insertions, 316 deletions

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 978c2a6dd8..7726cd089f 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -69,6 +69,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # for distributions currently known to OpenEmbedded.
 # DISTRO = "familiar"
 
+# Uncomment this to select a particular kernel version if supported by 
+# your MACHINE setting. Currently only supported on Zaurus Clamshells.
+# KERNEL_VERSION = "2.6"
+
 # Uncomment one of these to build packages during the build process.
 # This is done automatically if you set DISTRO (see above)
 # INHERIT = "package_ipk"
diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
deleted file mode 100644
index a3f4c1ee58..0000000000
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C700,Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus PXA devices running a 2.6 kernel
-
-include conf/machine/zaurus-clamshell.conf
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "cvs"
-
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils hostap-modules-cs orinoco-modules-cs \
-pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils"
-
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-
-ROOT_FLASH_SIZE = "64"
diff --git a/packages/base-files/base-files/openzaurus-pxa-2.6/fstab b/conf/machine/zaurus-clamshell-2.4.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/openzaurus-pxa-2.6/fstab
+++ b/conf/machine/zaurus-clamshell-2.4.conf
diff --git a/packages/base-files/base-files/openzaurus-pxa-2.6/usbd b/conf/machine/zaurus-clamshell-2.6.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/openzaurus-pxa-2.6/usbd
+++ b/conf/machine/zaurus-clamshell-2.6.conf
diff --git a/packages/initscripts/initscripts-1.0/corgi/devices b/packages/initscripts/initscripts-1.0/corgi/devices
index 8ec00bedeb..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/corgi/devices
+++ b/packages/initscripts/initscripts-1.0/corgi/devices
@@ -43,6 +43,11 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
 	ln -sf /dev/sharp_ts /dev/ts
         ln -sf /dev/sharp_fl /dev/fl
 	ln -sf /proc/self/fd /dev/fd
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh b/packages/initscripts/initscripts-1.0/corgi/keymap
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh
+++ b/packages/initscripts/initscripts-1.0/corgi/keymap
diff --git a/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-husky b/packages/initscripts/initscripts-1.0/corgikeymap-2.6.map
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-husky
+++ b/packages/initscripts/initscripts-1.0/corgikeymap-2.6.map
diff --git a/packages/initscripts/initscripts-1.0/husky/devices b/packages/initscripts/initscripts-1.0/husky/devices
index 8ec00bedeb..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/husky/devices
+++ b/packages/initscripts/initscripts-1.0/husky/devices
@@ -43,6 +43,11 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
 	ln -sf /dev/sharp_ts /dev/ts
         ln -sf /dev/sharp_fl /dev/fl
 	ln -sf /proc/self/fd /dev/fd
diff --git a/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-openzaurus-pxa-2.6 b/packages/initscripts/initscripts-1.0/husky/keymap
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-openzaurus-pxa-2.6
+++ b/packages/initscripts/initscripts-1.0/husky/keymap
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map
deleted file mode 100644
index 0d261fe708..0000000000
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map
+++ /dev/null
@@ -1,211 +0,0 @@
-# Default kernel keymap. This uses 7 modifier combinations.
-keymaps 0-2,4-5,8,12
-# Change the above line into
-#	keymaps 0-2,4-6,8,12
-# in case you want the entries
-#	altgr   control keycode  83 = Boot            
-#	altgr   control keycode 111 = Boot            
-# below.
-#
-keycode   1 =        
-keycode   2 = one              exclam    
-	control alt     keycode  2 = Console_1
-keycode   3 = two              quotedbl			
-	control alt     keycode  3 = Console_2
-keycode   4 = three            numbersign      
-	control alt     keycode  4 = Console_3
-keycode   5 = four             dollar           
-	control alt     keycode  5 = Console_4
-keycode   6 = five             percent         
-	control alt     keycode  6 = Console_5
-keycode   7 = six              ampersand     
-	control alt     keycode  7 = Console_6
-keycode   8 = seven            apostrophe
-keycode   9 = eight            parenleft
-keycode  10 = nine             parenright
-keycode  11 = zero             asciitilde
-keycode  12 = minus            at
-	altgr keycode 12 = at
-keycode  13 = 
-keycode  14 = BackSpace
-	altgr keycode 14 = Delete
-keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
-keycode  16 = q               
-keycode  17 = w               
-	altgr keycode 17 = asciicircum
-keycode  18 = e
-	altgr keycode 18 = equal
-keycode  19 = r          
-	altgr keycode 19 = plus     
-keycode  20 = t               
-	altgr keycode 20 = bracketleft
-keycode  21 = y               
-	altgr keycode 21 = bracketright
-keycode  22 = u      
-	altgr keycode 22 = braceleft         
-keycode  23 = i           
-	altgr keycode 23 = braceright    
-keycode  24 = o               
-keycode  25 = p               
-keycode  26 = 
-keycode  27 =
-keycode  28 = Return          
-keycode  29 = Control         
-keycode  30 = a
-keycode  31 = s               
-keycode  32 = d
-keycode  33 = f
-	altgr keycode 33 = backslash             
-keycode  34 = g               
-	altgr keycode 34 = semicolon
-keycode  35 = h         
-	altgr keycode 35 = colon      
-keycode  36 = j        
-	altgr keycode 36 = asterisk       
-keycode  37 = k   
-    altgr keycode 37 = backslash
-keycode  38 = l         
-	altgr keycode 38 = bar      
-keycode  39 =  
-keycode  40 = 
-keycode  41 =     
-keycode  42 = Shift           
-keycode  43 =  
-keycode  44 = z               
-keycode  45 = x               
-keycode  46 = c
-keycode  47 = v               
-keycode  48 = b
-	altgr keycode 48 = underscore
-keycode  49 = n               
-keycode  50 = m               
-keycode  51 = slash		comma
-	altgr keycode 51 = less
-keycode  52 = period           question         
-	altgr     keycode  52 = greater     
-keycode  53 =      
-keycode  54 = Shift           
-keycode  55 = 
-keycode  56 = Alt             
-keycode  57 = space            space           
-	control keycode  57 = nul   
-keycode 59 = F9
-keycode 60 = F10
-keycode 61 = AltGr
-keycode 62 = Escape
-keycode 63 = Return
-keycode 64 = Escape
-keycode 65 = Down
-keycode 66 = Up
-keycode 67 = Control
-keycode 68 = F13
-keycode 79 = F15
-keycode 80 = F16
-keycode 82 = F17
-keycode 87 = Return
-keycode 88 = F11	          
-keycode 97 = Control  
-keycode 99 = F12       
-keycode 103 = Up              
-keycode 105 = Left            
-	altgr     keycode 105 = Decr_Console
-keycode 106 = Right           
-	altgr     keycode 106 = Incr_Console
-keycode 108 = Down  
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
-string F6 = "\033[17~"
-string F7 = "\033[18~"
-string F8 = "\033[19~"
-string F9 = "\033[20~"
-string F10 = "\033[21~"
-string F11 = "\033[23~"
-string F12 = "\033[24~"
-string F13 = "\033[25~"
-string F14 = "\033[26~"
-string F15 = "\033[28~"
-string F16 = "\033[29~"
-string F17 = "\033[31~"
-string F18 = "\033[32~"
-string F19 = "\033[33~"
-string F20 = "\033[34~"
-string Find = "\033[1~"
-string Insert = "\033[2~"
-string Remove = "\033[3~"
-string Select = "\033[4~"
-string Prior = "\033[5~"
-string Next = "\033[6~"
-string Macro = "\033[M"
-string Pause = "\033[P"
-compose '`' 'A' to 'À'
-compose '`' 'a' to 'à'
-compose '\'' 'A' to 'Á'
-compose '\'' 'a' to 'á'
-compose '^' 'A' to 'Â'
-compose '^' 'a' to 'â'
-compose '~' 'A' to 'Ã'
-compose '~' 'a' to 'ã'
-compose '"' 'A' to 'Ä'
-compose '"' 'a' to 'ä'
-compose 'O' 'A' to 'Å'
-compose 'o' 'a' to 'å'
-compose '0' 'A' to 'Å'
-compose '0' 'a' to 'å'
-compose 'A' 'A' to 'Å'
-compose 'a' 'a' to 'å'
-compose 'A' 'E' to 'Æ'
-compose 'a' 'e' to 'æ'
-compose ',' 'C' to 'Ç'
-compose ',' 'c' to 'ç'
-compose '`' 'E' to 'È'
-compose '`' 'e' to 'è'
-compose '\'' 'E' to 'É'
-compose '\'' 'e' to 'é'
-compose '^' 'E' to 'Ê'
-compose '^' 'e' to 'ê'
-compose '"' 'E' to 'Ë'
-compose '"' 'e' to 'ë'
-compose '`' 'I' to 'Ì'
-compose '`' 'i' to 'ì'
-compose '\'' 'I' to 'Í'
-compose '\'' 'i' to 'í'
-compose '^' 'I' to 'Î'
-compose '^' 'i' to 'î'
-compose '"' 'I' to 'Ï'
-compose '"' 'i' to 'ï'
-compose '-' 'D' to 'Ð'
-compose '-' 'd' to 'ð'
-compose '~' 'N' to 'Ñ'
-compose '~' 'n' to 'ñ'
-compose '`' 'O' to 'Ò'
-compose '`' 'o' to 'ò'
-compose '\'' 'O' to 'Ó'
-compose '\'' 'o' to 'ó'
-compose '^' 'O' to 'Ô'
-compose '^' 'o' to 'ô'
-compose '~' 'O' to 'Õ'
-compose '~' 'o' to 'õ'
-compose '"' 'O' to 'Ö'
-compose '"' 'o' to 'ö'
-compose '/' 'O' to 'Ø'
-compose '/' 'o' to 'ø'
-compose '`' 'U' to 'Ù'
-compose '`' 'u' to 'ù'
-compose '\'' 'U' to 'Ú'
-compose '\'' 'u' to 'ú'
-compose '^' 'U' to 'Û'
-compose '^' 'u' to 'û'
-compose '"' 'U' to 'Ü'
-compose '"' 'u' to 'ü'
-compose '\'' 'Y' to 'Ý'
-compose '\'' 'y' to 'ý'
-compose 'T' 'H' to 'Þ'
-compose 't' 'h' to 'þ'
-compose 's' 's' to 'ß'
-compose '"' 'y' to 'ÿ'
-compose 's' 'z' to 'ß'
-compose 'i' 'j' to 'ÿ'
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
deleted file mode 100644
index e138e631a5..0000000000
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# Devfs handling script.  Since we arent running devfsd due to various reasons
-# which I will not lay out here, we need to create some links for compatibility.
-
-. /etc/default/rcS
-
-if test -e /dev/.devfsd
-then
-	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
-	ln -s /dev/touchscreen/0 /dev/ts
-	ln -s /dev/touchscreen/0raw /dev/tsraw
-	ln -s /dev/vc/0 /dev/tty0
-	ln -s /dev/vc/1 /dev/tty1
-	ln -s /dev/vc/2 /dev/tty2
-	ln -s /dev/vc/3 /dev/tty3
-	ln -s /dev/vc/4 /dev/tty4
-	ln -s /dev/vc/5 /dev/tty5
-	ln -s /dev/fb/0 /dev/fb0
-#	ln -s /dev/tts/0 /dev/ttySA0
-#	ln -s /dev/tts/1 /dev/ttySA1
-#	ln -s /dev/tts/2 /dev/ttySA2
-
-	ln -s /dev/sound/dsp /dev/dsp
-	ln -s /dev/sound/mixer /dev/mixer
-
-	ln -s /dev/v4l/video0 /dev/video0
-	ln -s /dev/v4l/video0 /dev/video
-	ln -s /dev/misc/rtc /dev/rtc
-
-	## need this so that ppp will autoload the ppp modules
-	mknod /dev/ppp c 108 0
-	if test "$VERBOSE" != "no"; then echo "done"; fi
-else
-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
-	cd /
-	mkdir -p dev/msys
-	mkdir -p dev/pts
-	mkdir -p dev/input
-	ln -sf /dev/sharp_ts /dev/ts
-        ln -sf /dev/sharp_fl /dev/fl
-	ln -sf /proc/self/fd /dev/fd
-	ln -sf /proc/kcore /dev/core
-	/sbin/makedevs -r / -D /etc/device_table
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-fi
-
-exit 0
diff --git a/packages/initscripts/initscripts-1.0/shepherd/devices b/packages/initscripts/initscripts-1.0/shepherd/devices
index 6a028d9942..b3a3323b8a 100644
--- a/packages/initscripts/initscripts-1.0/shepherd/devices
+++ b/packages/initscripts/initscripts-1.0/shepherd/devices
@@ -43,6 +43,7 @@ else
 	cd /
 	mkdir -p dev/msys
 	mkdir -p dev/pts
+	mkdir -p dev/input
 	mkdir -p dev/vc
 	for i in 0 1 2 3 4 5 6 7 8 9; do
 		ln -s /dev/tty$i /dev/vc/$i
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/qpe.conf b/packages/initscripts/initscripts-1.0/shepherd/keymap
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/qpe.conf
+++ b/packages/initscripts/initscripts-1.0/shepherd/keymap
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index ed22ca46b5..25d884892b 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,6 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
-RDEPENDS_openzaurus-pxa-2.6 = "makedevs console-tools"
 LICENSE = "GPL"
 PR = "r32"
 
@@ -34,8 +33,12 @@ SRC_URI = "file://halt \
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_openzaurus-pxa-2.6 = " file://corgikeymap.map"
-SRC_URI_append_openzaurus-pxa-2.6 = " file://keymap.sh"
+SRC_URI_append_corgi =    " file://keymap"
+SRC_URI_append_shepherd = " file://keymap"
+SRC_URI_append_husky =    " file://keymap"
+SRC_URI_append_corgi =    " file://corgikeymap.map"
+SRC_URI_append_shepherd = " file://corgikeymap.map"
+SRC_URI_append_husky =    " file://corgikeymap.map"
 
 def read_kernel_version(d):
 	import bb
@@ -92,10 +95,10 @@ do_install () {
 		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S05version
 	fi
 
-	if [ "${MACHINE}" == "openzaurus-pxa-2.6" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap.map		${D}/etc
-		install -m 0755    ${WORKDIR}/keymap.sh			${D}/etc/init.d
-		ln -sf          ../init.d/keymap.sh  	${D}/etc/rcS.d/S04keymap.sh
+	if [ "${MACHINE}" == "corgi" -o "${MACHINE}" == "shepherd" -o "${MACHINE}" == "husky" ]; then
+		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/etc
+		install -m 0755    ${WORKDIR}/keymap			${D}/etc/init.d
+		ln -sf          ../init.d/keymap  	${D}/etc/rcS.d/S04keymap
 	fi
 
 
diff --git a/packages/tslib/tslib/corgi/ts.conf b/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-corgi
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/corgi/ts.conf
+++ b/packages/linux/linux-openzaurus-2.6.11-rc4/defconfig-corgi
diff --git a/packages/linux/linux-openzaurus_2.6.11-rc4.bb b/packages/linux/linux-openzaurus_2.6.11-rc4.bb
index e69de29bb2..d04097a96b 100644
--- a/packages/linux/linux-openzaurus_2.6.11-rc4.bb
+++ b/packages/linux/linux-openzaurus_2.6.11-rc4.bb
@@ -0,0 +1,143 @@
+DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices."
+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 = "r0"
+
+# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
+# 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.11-rc1-bk7.gz;patch=1 \
+
+# These have been left in the hope JL will split his patch series...
+#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_devices.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_lcd.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_uart.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_batswitch.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_pcmcia.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
+
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.10.tar.gz \
+	   ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc4.bz2;patch=2 \
+           file://add-oz-release-string.patch;patch=1 \
+           file://add-elpp-stuff.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \	   
+http://www.cs.wisc.edu/~lenz/zaurus/files/patch-2.6.11-rc2-jl1.diff.gz;patch=1 \
+http://www.cs.wisc.edu/~lenz/zaurus/files/poodle_fix_mtd_sharpsl_part.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/rndis_fix-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/w100_malloc-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r16.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r10.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/input_power-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras1-r2.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power-r15.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r3.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_snd-r3.patch;patch=1 \
+file://defconfig-husky \
+file://defconfig-collie \
+file://defconfig-poodle \
+file://defconfig-openzaurus-pxa-2.6 "
+
+
+SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1 "
+
+S = "${WORKDIR}/linux-2.6.10"
+
+inherit kernel
+
+##############################################################
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1
+
+EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
+COMPATIBLE_HOST = "arm.*-linux"
+
+##############################################################
+# Create the kernel command line (mtdparts deprecated)
+#
+#CMDLINE_MTDPARTS_poodle   = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_corgi    = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)"
+#CMDLINE_MTDPARTS_husky    = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) mem=64M"
+#CMDLINE_MTDPARTS_tosa     = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2"
+
+CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
+CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
+CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
+
+##############################################################
+# 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_MTDPARTS} ${CMDLINE_MEM}"
+
+###############################################################
+# Enable or disable ELPP via local.conf - default is "no"
+#
+ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+
+do_configure() {
+
+	if [ "${MACHINE}" == "shepherd" -o "${MACHINE}" == "husky" ]; then
+	    install -m 0644 ${WORKDIR}/defconfig-corgi ${S}/.config || die "No default configuration for ${MACHINE} available."
+	else
+	    install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+	fi
+
+	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
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index b930b7baf4..c03994f614 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -17,7 +17,6 @@ OPIE_LIBS_RDEPENDS_append_corgi              = " qpf-bitstream-vera-large qpf-bi
 OPIE_LIBS_RDEPENDS_append_shepherd           = " qpf-bitstream-vera-large qpf-bitstream-vera-sans-mono-large"
 OPIE_LIBS_RDEPENDS_append_husky              = " qpf-bitstream-vera-large qpf-bitstream-vera-sans-mono-large"
 OPIE_LIBS_RDEPENDS_append_tosa               = " qpf-bitstream-vera-large qpf-bitstream-vera-sans-mono-large"
-OPIE_LIBS_RDEPENDS_append_openzaurus-pxa-2.6 = " qpf-bitstream-vera-large qpf-bitstream-vera-sans-mono-large"
 
 #
 # Things for reasonable bootstrap image
@@ -47,7 +46,6 @@ OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus ope
 OPIE_BASE_DEPENDS_append_corgi                = " opie-autorotateapplet"
 OPIE_BASE_DEPENDS_append_shepherd             = " opie-autorotateapplet"
 OPIE_BASE_DEPENDS_append_husky                = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_openzaurus-pxa-2.6   = " opie-autorotateapplet"
 
 #
 # Additional things for a standard 16MB distribution
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index bbfd8762af..bb37208470 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -31,14 +31,12 @@ EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_openzaurus-pxa-2.6 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 
 # Wallpaper and welcome splash
 PIXMAP_SIZE 		= ""
 PIXMAP_SIZE_shepherd 	= "-640x480"
 PIXMAP_SIZE_corgi 	= "-640x480"
 PIXMAP_SIZE_husky 	= "-640x480"
-PIXMAP_SIZE_openzaurus-pxa-2.6 = "-640x480"
 # PIXMAP_SIZE_tosa 	= "-640x480"
 PIXMAP_SIZE_simpad 	= "-800x600"
 
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 2388edb80e..a2dc0a26b6 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -31,7 +31,6 @@ SRC_URI_append_shepherd		= "file://kernel-keymap.patch;patch=1 file://kernel-key
 SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
 SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
-SRC_URI_append_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_jornada720       = "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_jornada56x       = "file://kernel-keymap.patch;patch=1 "
 
@@ -74,7 +73,6 @@ EXTRA_DEFINES_corgi     	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_
 EXTRA_DEFINES_shepherd  	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_husky		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"
diff --git a/packages/tslib/tslib/corgi/tslib.sh b/packages/tslib/tslib/corgi/tslib.sh
index e69de29bb2..dc7484cada 100644
--- a/packages/tslib/tslib/corgi/tslib.sh
+++ b/packages/tslib/tslib/corgi/tslib.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/ts
+	TSLIB_TSEVENTTYPE=CORGI
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSEVENTTYPE=INPUT
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/husky/tslib.sh b/packages/tslib/tslib/husky/tslib.sh
index e69de29bb2..dc7484cada 100644
--- a/packages/tslib/tslib/husky/tslib.sh
+++ b/packages/tslib/tslib/husky/tslib.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/ts
+	TSLIB_TSEVENTTYPE=CORGI
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSEVENTTYPE=INPUT
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf b/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh b/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh
deleted file mode 100644
index 9c515243a7..0000000000
--- a/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/event1
-TSLIB_TSEVENTTYPE=INPUT
-
-export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
diff --git a/packages/tslib/tslib/shepherd/tslib.sh b/packages/tslib/tslib/shepherd/tslib.sh
index e69de29bb2..dc7484cada 100644
--- a/packages/tslib/tslib/shepherd/tslib.sh
+++ b/packages/tslib/tslib/shepherd/tslib.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/ts
+	TSLIB_TSEVENTTYPE=CORGI
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSEVENTTYPE=INPUT
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/husky/ts.conf b/packages/tslib/tslib/ts.conf-corgi
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/husky/ts.conf
+++ b/packages/tslib/tslib/ts.conf-corgi
diff --git a/packages/tslib/tslib/shepherd/ts.conf b/packages/tslib/tslib/ts.conf-corgi-2.4
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/shepherd/ts.conf
+++ b/packages/tslib/tslib/ts.conf-corgi-2.4
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 46c6b153a7..25b7b0ba5d 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -10,6 +10,7 @@ PACKAGE_ARCH_ramses = "${MACHINE}"
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
 	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 \
+	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
 	   file://tslib.sh \
 	   file://initialize_djs.patch;patch=1 \
 	   file://visibility.patch;patch=1"
@@ -48,6 +49,13 @@ do_install_append() {
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
 		;;
+	corgi | shepherd | husky)
+		install -d ${D}${datadir}/tslib
+		for f in ts.conf-corgi ts.conf-corgi-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
 	*)
 		;;
 	esac