summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-25 11:51:44 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-25 11:51:44 +0000
commit61b8fecfd244e7d73491b2558dede15f8541fa79 (patch)
tree88282ba73f7028e24e1e483c40ace808938a2840
parenta0a8127e2c74b23889e63ad749f8d9949f1fca2b (diff)
parentab20a91f2bc091bd101383fc35f12e29382a5b7d (diff)
merge of '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
and '8a68b62f9b7e2ae09097a8b9390d75dbcfc1ca82'
-rw-r--r--conf/machine/netvista.conf4
-rw-r--r--packages/linux/linux-2.6.23/netvista/defconfig4
-rw-r--r--packages/tslib/tslib/bd-neon/ts.conf2
-rw-r--r--packages/tslib/tslib/bd-neon/tslib.sh6
-rw-r--r--packages/tslib/tslib_1.0.bb2
5 files changed, 7 insertions, 11 deletions
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index f95e403367..65ad872ba6 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -7,7 +7,7 @@ PACKAGE_EXTRA_ARCHS = "netvista"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.23"
-XSERVER = "xserver-kdrive-vesa"
+XSERVER = "xserver-kdrive-fbdev"
KERNEL_IMAGETYPE = "bzImage"
@@ -23,3 +23,5 @@ udevdir = "/dev"
OLDEST_KERNEL = "2.6.17"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+require conf/machine/include/tune-x86.inc
diff --git a/packages/linux/linux-2.6.23/netvista/defconfig b/packages/linux/linux-2.6.23/netvista/defconfig
index cb069c7887..1d98edf875 100644
--- a/packages/linux/linux-2.6.23/netvista/defconfig
+++ b/packages/linux/linux-2.6.23/netvista/defconfig
@@ -780,10 +780,10 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_TSDEV=m
+CONFIG_INPUT_TSDEV=y
CONFIG_INPUT_TSDEV_SCREEN_X=800
CONFIG_INPUT_TSDEV_SCREEN_Y=600
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
#
diff --git a/packages/tslib/tslib/bd-neon/ts.conf b/packages/tslib/tslib/bd-neon/ts.conf
index 15fe294ce6..20dd11cf6a 100644
--- a/packages/tslib/tslib/bd-neon/ts.conf
+++ b/packages/tslib/tslib/bd-neon/ts.conf
@@ -1,4 +1,4 @@
-module_raw ucb1x00
+module_raw input
module pthres pmin=1
module variance delta=500
module dejitter delta=10000
diff --git a/packages/tslib/tslib/bd-neon/tslib.sh b/packages/tslib/tslib/bd-neon/tslib.sh
deleted file mode 100644
index b5f1c906f3..0000000000
--- a/packages/tslib/tslib/bd-neon/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/touch_ucb1x00
-
-export TSLIB_TSDEVICE
-
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 725e067a0b..6fa0b3fccc 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
-PR = "r18"
+PR = "r19"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \