From b496b5a03f68d5384a282604b907d0f2451ddcbc Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 18 Jun 2013 23:01:56 +0200 Subject: machine: force x-server version 1.13.1 - the binary only x-server driver only supports API for 1.13 at the moment - remove a backup file --- conf/machine/apalis-t30.conf | 1 + conf/machine/colibri-t20.conf | 1 + conf/machine/colibri-t30.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf index 47fc88d..55206b5 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -13,6 +13,7 @@ UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" KEEPUIMAGE = "" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_colibri-t30 = "1.13.1" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf index 2d0970d..3bb92a9 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -11,6 +11,7 @@ UBOOT_MACHINE = "colibri_t20_config" UBOOT_ENTRYPOINT = "0x00008000" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_colibri-t20 = "1.13.1" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf index 7c53154..3f2d505 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -1,4 +1,3 @@ - #@TYPE: Machine #@NAME: colibri_t30 #@DESCRIPTION: Toradex Colibri T30 @@ -14,6 +13,7 @@ UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" KEEPUIMAGE = "" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_VERSION_xserver-xorg_colibri-t30 = "1.13.1" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ -- cgit v1.2.3