9 files changed, 56 insertions, 11 deletions
diff --git a/conf/machine/simpad-2.4.conf b/conf/machine/simpad-2.4.conf
new file mode 100644
index 0000000000..a26bc5c04e
--- /dev/null
+++ b/conf/machine/simpad-2.4.conf
@@ -0,0 +1,16 @@
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules \
+pcmcia-cs apmd hostap-utils \
+wpa-supplicant-nossl"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules \
+orinoco-modules-cs pcmcia-cs apm hostap-utils \
+wpa-supplicant-nossl"
+
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
+kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
+kernel-module-pcnet-cs kernel-module-8390"
diff --git a/conf/machine/simpad-2.6.conf b/conf/machine/simpad-2.6.conf
new file mode 100644
index 0000000000..1a5bd38989
--- /dev/null
+++ b/conf/machine/simpad-2.6.conf
@@ -0,0 +1,9 @@
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
+
+BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules hostap-utils orinoco-modules wpa-supplicant-nossl"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
+kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
+kernel-module-pcnet-cs kernel-module-8390"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 119e11b064..0447099204 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -5,14 +5,9 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
-BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules orinoco-modules "
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"
+KERNEL_VERSION ?= "2.4"
+include conf/machine/simpad-${KERNEL_VERSION}.conf
 
 # This is needed for the ramdisk script to work
 BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
@@ -26,6 +21,8 @@ USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
 ROOT_FLASH_SIZE = "24"
 USE_VT = "0"
+GPE_EXTRA_DEPENDS += "gaim sylpheed"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/handheld-common.conf
 include conf/machine/tune-strongarm.conf
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 4db17f4566..f3fb85b7e1 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -8,7 +8,7 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
 PR = "r19"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opensimpad-${PV}"
+FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://${KV}-${VRSV}.patch;patch=1 \
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 806d1d62cf..0e86da015d 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -9,7 +9,7 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
 USBV= "usb20040610"
 PR = "r1"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opensimpad-${PV}"
+FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://${KV}-${VRSV}.patch;patch=1 \
diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index e87a2095c4..8bb94a037f 100644
--- a/packages/tslib/tslib/simpad/tslib.sh
+++ b/packages/tslib/tslib/simpad/tslib.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/event0
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event0
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
 
-export TSLIB_TSDEVICE
diff --git a/packages/tslib/tslib/simpad/ts.conf b/packages/tslib/tslib/ts.conf-simpad
index 09309719f2..09309719f2 100644
--- a/packages/tslib/tslib/simpad/ts.conf
+++ b/packages/tslib/tslib/ts.conf-simpad
diff --git a/packages/tslib/tslib/ts.conf-simpad-2.4 b/packages/tslib/tslib/ts.conf-simpad-2.4
new file mode 100644
index 0000000000..035e794cb4
--- /dev/null
+++ b/packages/tslib/tslib/ts.conf-simpad-2.4
@@ -0,0 +1,5 @@
+module_raw ucb1x00
+module pthres pmin=1
+module variance delta=10
+module dejitter delta=150
+module linear
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 9e6c4e26d3..f0267a6814 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -11,6 +11,7 @@ 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-h6300 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
+	   file://ts.conf-simpad file://ts.conf-simpad-2.4 \
 	   file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -54,6 +55,13 @@ do_install_append() {
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
 		;;
+	simpad )
+		install -d ${D}${datadir}/tslib
+		for f in ts.conf-simpad ts.conf-simpad-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
 	*)
 		;;
 	esac