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

BKrev: 420fca1ej6LEvrP_Xe_wpNwLC8AyAQ

9 files changed, 56 insertions, 11 deletions

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/ts.conf b/packages/tslib/tslib/shepherd/ts.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/shepherd/ts.conf
+++ /dev/null
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/corgi/ts.conf b/packages/tslib/tslib/ts.conf-corgi
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/corgi/ts.conf
+++ b/packages/tslib/tslib/ts.conf-corgi
diff --git a/packages/tslib/tslib/husky/ts.conf b/packages/tslib/tslib/ts.conf-corgi-2.4
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/husky/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