From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Tue, 12 Jan 2010 01:43:44 +0000 (+0000)
Subject: xserver-common: add SAM9G10/G45/9RL to Xserver file
X-Git-Tag: Release-2010-05/1~807^2~7^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0833a8385db355753863b74864e88cc4faa9f13;p=openembedded.git

xserver-common: add SAM9G10/G45/9RL to Xserver file

Adding some Atmel AT91 chips to Xserver file.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/xserver-common/files/Xserver-at91.patch b/recipes/xserver-common/files/Xserver-at91.patch
new file mode 100644
index 0000000000..e030e9fd57
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver-at91.patch
@@ -0,0 +1,18 @@
+diff -ru xserver-common-1.25.orig/X11/Xserver xserver-common-1.25/X11/Xserver
+--- xserver-common-1.25.orig/X11/Xserver	2010-01-12 12:04:52.000000000 +0100
++++ xserver-common-1.25/X11/Xserver	2010-01-12 12:15:32.000000000 +0100
+@@ -104,8 +104,12 @@
+ 		ARGS="$ARGS -dpi 100 -screen 480x640@270" ;;
+ 	"HTC Tornado")
+ 		ARGS="$ARGS -dpi 100 -hide-cursor" ;;
+-	"Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK")
+-		ARGS="$ARGS -dpi 100 -rgba bgr -screen 240x320" ;;	
++	"Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK" | "Atmel AT91CAP9A-DK" | "Atmel AT91CAP9-STK")
++		ARGS="$ARGS -dpi 100 -rgba bgr -screen ${SCREEN_SIZE} " ;;
++	"Atmel AT91SAM9RL-EK" | "Atmel AT91SAM9G10-EK" )
++		ARGS="$ARGS -dpi 100 -rgba rgb -screen ${SCREEN_SIZE} " ;;
++	"Atmel AT91SAM9M10-EKES" | "Atmel AT91SAM9G45-EKES" | "Atmel AT91SAM9M10G45-EK")
++		ARGS="$ARGS -rgba rgb -screen 480x272 " ;;
+ 	"Generic OMAP1510/1610/1710" | "Nokia N770")
+ 		ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;;
+ 	"Nokia N800")
diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb
index b55e0e5ce1..40ec4affa0 100644
--- a/recipes/xserver-common/xserver-common_1.25.bb
+++ b/recipes/xserver-common/xserver-common_1.25.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r3"
+PR = "r4"
 
 PACKAGE_ARCH = "all"
 
@@ -13,6 +13,7 @@ SRC_URI_append = " file://setDPI.sh \
                    file://89xdgautostart.sh \
                    file://avoid-rotated-server.patch;patch=1 \
                    file://ts-handling-cleanup.diff;patch=1 \
+                   file://Xserver-at91.patch;patch=1 \
 "
 
 SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "