Merge bk://openembedded@openembedded.bkbits.net/packages

into debian.(none):/home/ich/programming/oe/oe-packages-exported

2004/06/25 21:05:03+02:00 (none)!ich
OpenSimpad touchscreen and kernel changes

BKrev: 40dc7789p4OKgGUJgvTDfcxOkq8wrQ

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index 9b4f3dc..69e77fc 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -29,16 +29,16 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SIMPAD_MEM = "32"
-SIMPAD_RD = "32"
-CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "
+SIMPAD_MEM     = ${@oe.data.getVar("SIMPAD_MEMORY_SIZE",d,1)  or "32"}
+SIMPAD_RD      = ${@oe.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}
+export CMDLINE = ${@oe.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
 EXTRA_OEMAKE = ""
 
 do_configure() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-
-        mem=${SIMPAD_MEM}
-        rd=${SIMPAD_RD}
+              
+       mem=${SIMPAD_MEM}
+       rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
         rdsize=`echo "$rd * 1024" | bc`
         total=`expr $mem + $rd`

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 0f385a6..c03df48 100644 (file)
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -54,7 +54,7 @@ EXTRA_OEMAKE = "-e"
 EXTRA_DEFINES          = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
 EXTRA_DEFINES_collie   = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_h3600    = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad   = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
+EXTRA_DEFINES_simpad   = "            -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
 EXTRA_DEFINES_shepherd  = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
 EXTRA_DEFINES_husky    = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"
 EXTRA_DEFINES_boxer     = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700"

diff --git a/tslib/tslib/simpad/tslib.sh b/tslib/tslib/simpad/tslib.sh
index e69de29..263b6d3 100644 (file)
--- a/tslib/tslib/simpad/tslib.sh
+++ b/tslib/tslib/simpad/tslib.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
+
+export TSLIB_TSDEVICE