summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-31 18:43:16 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-02-01 15:52:33 (GMT)
commit706a62e662dde79bc4e7ec0f81b76890e49f4beb (patch)
treec4d04ab7485dc9f874ddd9efaaea261a4c05a026
parent5c2feb6f9fa200bf4a7a6af3a36b78c28c078e52 (diff)
downloadmeta-intel-706a62e662dde79bc4e7ec0f81b76890e49f4beb.tar.gz
fri2: use EMGD version 1.16 instead of 1.14
The recently added 1.16 version of the EMGD graphics stack also works for the FRI2 BSP. Update the BSP to use the newer EMGD version for graphics. This partly addresses: [YOCTO #3809] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index a1b13fa..12b8367 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -27,7 +27,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
27PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 27PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
28PREFERRED_VERSION_mesa-dri ?= "9.0.1" 28PREFERRED_VERSION_mesa-dri ?= "9.0.1"
29PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 29PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
30PREFERRED_VERSION_emgd-driver-bin ?= "1.14" 30PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
31 31
32# Syslinux does not know about the 64MHz uart clock and it does not detect the 32# Syslinux does not know about the 64MHz uart clock and it does not detect the
33# serial device by number. Use the IO port directly and divide the baud down to 33# serial device by number. Use the IO port directly and divide the baud down to
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 9165f21..e47bae3 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
6KERNEL_FEATURES_fri2_append = " features/drm-emgd cfg/vesafb" 6KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7SRCREV_machine_pn-linux-yocto_fri2 ?= "${AUTOREV}" 7SRCREV_machine_pn-linux-yocto_fri2 ?= "${AUTOREV}"
8SRCREV_meta_pn-linux-yocto_fri2 ?= "${AUTOREV}" 8SRCREV_meta_pn-linux-yocto_fri2 ?= "${AUTOREV}"
9 9