From: Mirko Vogt <mirko@openwrt.org>
Date: Thu, 1 Jan 2009 17:41:14 +0000 (+0000)
Subject: adding touchscreen calibration file for the Openmoko gta02 "Freerunner" and some... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=c5ad3d266e51421cd59d87ab66f6a3b7f2fd957c

adding touchscreen calibration file for the Openmoko gta02 "Freerunner" and some minor changes


SVN-Revision: 13797
---

diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile
index 5e4c503615..bfc6664bfe 100644
--- a/Xorg/xserver/xglamo/Makefile
+++ b/Xorg/xserver/xglamo/Makefile
@@ -52,8 +52,13 @@ CONFIGURE_ARGS += --disable-dga \
 
 CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
 
-ifeq ($(CONFIG_TARGET_om_gta02),y)
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-graphical),y)
   X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
+endif
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal),y)
+  X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
 endif
 
 define Package/xglamo
@@ -120,7 +125,8 @@ define Package/xglamo/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/
 	$(CP) ./files/x.init $(1)/etc/init.d/x11
-	$(if $(X_CONFIG),$(CP) ./files/config/$(X_CONFIG) $(1)/etc/config/x11)
+	$(if $(TS_POINTERCAL),$(CP) ./files/pointercal.$(TS_POINTERCAL) $(1)/etc/pointercal)
+	$(if $(X_CONFIG),$(CP) ./files/config/x11.$(X_CONFIG) $(1)/etc/config/x11)
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef
 
diff --git a/Xorg/xserver/xglamo/files/config/om_gta02 b/Xorg/xserver/xglamo/files/config/om_gta02
deleted file mode 100644
index f265cc739d..0000000000
--- a/Xorg/xserver/xglamo/files/config/om_gta02
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config screen
-	option	resolution	480x640
-	option	dpi	285
diff --git a/Xorg/xserver/xglamo/files/config/x11.om_gta02 b/Xorg/xserver/xglamo/files/config/x11.om_gta02
new file mode 100644
index 0000000000..f265cc739d
--- /dev/null
+++ b/Xorg/xserver/xglamo/files/config/x11.om_gta02
@@ -0,0 +1,5 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config screen
+	option	resolution	480x640
+	option	dpi	285
diff --git a/Xorg/xserver/xglamo/files/pointercal.om_gta02 b/Xorg/xserver/xglamo/files/pointercal.om_gta02
new file mode 100644
index 0000000000..841ec7fab2
Binary files /dev/null and b/Xorg/xserver/xglamo/files/pointercal.om_gta02 differ