Add X arguments for AT91 boards

* CAP9
* SAM9RL
* SAM9G10
* SAM9M10
* SAM9G45

Use xinput-calibrator to calibrate touch screen when building xorg

Signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/xserver-common/files/xserver-common-at91sam9.patch b/recipes/xserver-common/files/xserver-common-at91sam9.patch
new file mode 100644 (file)
index 0000000..ae8a864
--- /dev/null
+++ b/recipes/xserver-common/files/xserver-common-at91sam9.patch
@@ -0,0 +1,18 @@
+diff -u xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver
+--- xserver-common-1.22.old/X11/Xserver
++++ xserver-common-1.22/X11/Xserver
+@@ -100,8 +100,12 @@
+               ARGS="$ARGS -dpi 100 -screen 480x640@270" ;;
+       "HTC Tornado")
+               ARGS="$ARGS -dpi 100 -hide-cursor" ;;
+-      "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK")
+-              ARGS="$ARGS -mouse tslib -dpi 100 -rgba bgr -screen 240x320" ;; 
++      "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK" | "Atmel AT91CAP9A-DK" | "Atmel AT91CAP9-STK")
++              ARGS="$ARGS -mouse tslib -dpi 100 -rgba bgr -screen 240x320" ;;
++      "Atmel AT91SAM9RL-EK" | "Atmel AT91SAM9G10-EK" )
++              ARGS="$ARGS -mouse tslib -dpi 100 -rgba rgb -screen 240x320" ;;
++      "Atmel AT91SAM9M10-EKES" | "Atmel AT91SAM9G45-EKES" | "Atmel AT91SAM9M10G45-EK")
++              ARGS="$ARGS -mouse tslib -rgba rgb -screen 480x272" ;;
+       "Generic OMAP1510/1610/1710" | "Nokia N770")
+               ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+       "Nokia N800")

diff --git a/recipes/xserver-common/xserver-common_1.22.bb b/recipes/xserver-common/xserver-common_1.22.bb
index 160a3fd..d50614f 100644 (file)
--- a/recipes/xserver-common/xserver-common_1.22.bb
+++ b/recipes/xserver-common/xserver-common_1.22.bb
@@ -14,7 +14,9 @@ SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch \
                             file://xorg-fixes.patch \
                            file://gta-xorg-fixes.patch \
                             file://default.xmodmap \
-                            file://98keymap-fixup "
+                            file://98keymap-fixup \
+                           file://xserver-common-at91sam9.patch "
+
 
 do_install_append() {
        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"

diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index ff5711f..86f8932 100644 (file)
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r8"
+PR = "r9"
 
 PACKAGE_ARCH = "all"
 DEFAULT_PREFERENCE = "-1"
@@ -33,6 +33,9 @@ SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
                        file://Xserver.add.dpi.for.gta.patch \
                       file://Xserver.n900.patch"
 
+SRC_URI_append_at91 =  " file://89xTs_Calibrate.xinput_calibrator.patch \
+                       "
+
 do_install_append() {
        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
        install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"