diff options
| author |   Carsten Haitzler (Raster <raster@rasterman.com> | 2009-01-16 12:32:54 +1100 |
|---|---|---|
| committer | Carsten Haitzler (Raster) <raster@rasterman.com> | 2009-02-20 00:56:49 +1100 |
| commit | 3118ffbc0803047216ae312c38f7b00228d1ba72 (patch) | |
| tree | 648fb08015ed8ab3186cf97556a097768688c26d /packages/xserver-kdrive-common/xserver-kdrive-common/Xserver | |
| parent | e4eb34f03d1d89ea666aa346c1ad713ea74a5ebb (diff) | |
| download | openembedded-3118ffbc0803047216ae312c38f7b00228d1ba72.tar.gz | |
xserver-kdrive-common: sync openmoko and base xserver. allow for ppms and
beagleboard run-line.
Diffstat (limited to 'packages/xserver-kdrive-common/xserver-kdrive-common/Xserver')
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common/Xserver | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index d98d71e773..404bf8ba3f 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -41,7 +41,8 @@ export USER=root SCREEN_SIZE=`fallback_screen_arg` -ARGS=" -br -pn" +ARGS=" -pn" +PPM=" -br" # use ucb 1x00 touchscreen if present if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then @@ -104,18 +105,30 @@ case `module_id` in ARGS="$ARGS -fb /dev/fb1" ;; "GTA01") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else - DPI=140 + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi + DPI=142 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" ;; + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "GTA02") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else - DPI=140 + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi + DPI=142 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" XSERVER=/usr/bin/Xglamo ;; "Nokia N770") @@ -125,16 +138,25 @@ case `module_id` in ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" XSERVER=/usr/bin/Xomap ;; "Palm Treo 650") - ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor" ;; + if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm" + fi + ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor ${PPM}" ;; "Motorola Ezx Platform") + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm ${PPM}" + fi ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;; "Glofiish M800") - ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor" ;; + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi + ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "Freescale MX21ADS") # That's what /proc/cpuinfo shows as hardware on the chumby ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib" ;; "OMAP3 Beagle Board") - ARGS="$ARGS -br" + ARGS="$ARGS ${PPM}" # 32bpp - we'll enable it once newer kernels are.. working. # ARGS="$ARGS -fbbpp32" XSERVER=/usr/bin/Xorg ;; |