diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-09-14 23:33:32 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-09-15 15:02:30 -0500 |
commit | cdf9c835b60041bf144e262bf62fe895a53897e6 (patch) | |
tree | 2d413ef90a9c249d2b02d991ad17d69f66cee2d6 | |
parent | 8959d866f45d65152a600311edf17abe1eee61ab (diff) | |
download | meta-intel-cdf9c835b60041bf144e262bf62fe895a53897e6.tar.gz |
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 <tom.zanussi@intel.com>
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 1 | ||||
-rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 1 |
2 files changed, 2 insertions, 0 deletions
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} \ | |||
25 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 25 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
26 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 26 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
27 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 27 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
28 | PREFERRED_VERSION_emgd-driver-bin ?= "1.10" | ||
28 | 29 | ||
29 | # Syslinux does not know about the 64MHz uart clock and it does not detect the | 30 | # Syslinux does not know about the 64MHz uart clock and it does not detect the |
30 | # serial device by number. Use the IO port directly and divide the baud down to | 31 | # 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} \ | |||
21 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 21 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
22 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 22 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
23 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 23 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
24 | PREFERRED_VERSION_emgd-driver-bin ?= "1.10" | ||
24 | 25 | ||
25 | SERIAL_CONSOLE = "115200 ttyS0" | 26 | SERIAL_CONSOLE = "115200 ttyS0" |
26 | APPEND += "console=ttyS0,115200 console=tty0" | 27 | APPEND += "console=ttyS0,115200 console=tty0" |