diff options
| -rw-r--r-- | meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver index 57923e6b95..cea733e9fb 100644 --- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver | |||
| @@ -18,14 +18,6 @@ fi | |||
| 18 | 18 | ||
| 19 | . /etc/profile | 19 | . /etc/profile |
| 20 | 20 | ||
| 21 | module_id() { | ||
| 22 | ## used to read from assets, but sometimes assets is corrupted | ||
| 23 | # grep "Module ID" /proc/hal/assets | sed "s/.*://" | ||
| 24 | ## used to read from /proc/hal/model, but that is removed in 2.6 | ||
| 25 | # echo ' iPAQ' `cat /proc/hal/model` | ||
| 26 | awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo | ||
| 27 | } | ||
| 28 | |||
| 29 | ARGS=" -br -pn" | 21 | ARGS=" -br -pn" |
| 30 | 22 | ||
| 31 | if [ "$XSERVER" != "/usr/bin/Xorg" ]; then | 23 | if [ "$XSERVER" != "/usr/bin/Xorg" ]; then |
| @@ -44,22 +36,6 @@ if [ "$XSERVER" != "/usr/bin/Xorg" ]; then | |||
| 44 | ARGS="$ARGS -mouse tslib" | 36 | ARGS="$ARGS -mouse tslib" |
| 45 | fi | 37 | fi |
| 46 | 38 | ||
| 47 | # start off server in conventional location. | ||
| 48 | case `module_id` in | ||
| 49 | "Generic OMAP1510/1610/1710") | ||
| 50 | ARGS="$ARGS -mouse /dev/input/event0" ;; | ||
| 51 | "Compulab CM-x270") | ||
| 52 | #modprobe mbxfb | ||
| 53 | #ARGS="$ARGS -fb /dev/fb1" | ||
| 54 | ;; | ||
| 55 | "Nokia N800") | ||
| 56 | ARGS="$ARGS -mouse tslib" ;; | ||
| 57 | "Nokia 770") | ||
| 58 | ARGS="$ARGS -mouse tslib" ;; | ||
| 59 | *) | ||
| 60 | ;; | ||
| 61 | esac | ||
| 62 | |||
| 63 | ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}" | 39 | ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}" |
| 64 | 40 | ||
| 65 | if [ ! -z "$DISPLAY_DPI" ]; then | 41 | if [ ! -z "$DISPLAY_DPI" ]; then |
