diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-08-22 14:36:33 +0000 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-08-22 14:36:33 +0000 |
| commit | 42f62365a7105338af3aa5f7f0345d7ca651a968 (patch) | |
| tree | 75d648a8844c60d68d8badb2d622c309a2c7c20f | |
| parent | c22cd021e7c6eea88d7d76f4b7cebab803068b95 (diff) | |
| parent | e47a34105498a59b224702aa9bd3dfe054ab8954 (diff) | |
merge of 7977b8ce284c880bc8392583f70a410d660e9c7f
and bd9490f3e5b47d7aa5f58032d480a8d192520a4b
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/matchbox-panel/matchbox-panel.inc | 1 | ||||
| -rw-r--r-- | packages/tslib/tslib/h4000/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/tslib/tslib/h4000/tslib.sh | 19 |
5 files changed, 24 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4abeea6e9a..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -144,6 +144,7 @@ PCMCIA_MANAGER_tosa = "pcmciautils" PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -159,6 +160,7 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index e00598d937..7dfcb4d237 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,10 +3,10 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r2" +PR = "r3" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270|htcuniversal)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|ipaq-pxa270|htcuniversal)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc index f82b66a0e9..16f471356a 100644 --- a/packages/matchbox-panel/matchbox-panel.inc +++ b/packages/matchbox-panel/matchbox-panel.inc @@ -11,6 +11,7 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify " EXTRA_OECONF_append_h3600 = " --enable-small-icons " EXTRA_OECONF_append_h3900 = " --enable-small-icons " EXTRA_OECONF_append_h2200 = " --enable-small-icons " +EXTRA_OECONF_append_h4000 = " --enable-small-icons " EXTRA_OECONF_append_collie = " --enable-small-icons " EXTRA_OECONF_append_poodle = " --enable-small-icons " EXTRA_OECONF_append_mnci = " --enable-small-icons " diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/tslib/tslib/h4000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h4000/.mtn2git_empty diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh new file mode 100644 index 0000000000..0de3534a51 --- /dev/null +++ b/packages/tslib/tslib/h4000/tslib.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +case `uname -r` in +2.4*) + TSLIB_TSDEVICE=/dev/touchscreen/0raw + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 + ;; +*) + TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac + +export TSLIB_TSDEVICE TSLIB_CONFFILE + |