From cdf9c835b60041bf144e262bf62fe895a53897e6 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 14 Sep 2012 23:33:32 -0500 Subject: meta-intel: have fri2 and sys940x prefer emgd-1.10 fri2 and sys940x need to use emgd-1.10 instead of the newer 1.14. Signed-off-by: Tom Zanussi --- meta-fri2/conf/machine/fri2.conf | 1 + meta-sys940x/conf/machine/sys940x.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index bf7754fc..39fb6984 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -25,6 +25,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" +PREFERRED_VERSION_emgd-driver-bin ?= "1.10" # Syslinux does not know about the 64MHz uart clock and it does not detect the # serial device by number. Use the IO port directly and divide the baud down to diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index f71bb3a8..46c43159 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -21,6 +21,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" +PREFERRED_VERSION_emgd-driver-bin ?= "1.10" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -- cgit v1.2.3-54-g00ecf