fri2: Update to EMGD 1.16

Use the recipe-space mechanism for adding emgd as a KERNEL_FEATURE.
Update to the 1.16 version and update all the SRCREV's accordingly.
Include the EMGD branch in the SRC_URI and SRCREV for the fri2 machine.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

2 files changed, 12 insertions, 7 deletions

diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index ec343f2f..50c7922b 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -25,7 +25,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "8.0.4"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
 
 # 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-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
index dff9456d..7c35e070 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,15 +3,20 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "fri2"
 KBRANCH_fri2 = "standard/fri2"
-SRCREV_machine_pn-linux-yocto_fri2 ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2"
-SRCREV_meta_pn-linux-yocto_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f"
+KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
+SRCREV_machine_pn-linux-yocto_fri2 ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
+SRCREV_meta_pn-linux-yocto_fri2 ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
+SRCREV_emgd_fri2 = "f5c3a221f0e42d48ee5af369d73594e26ef7fae6"
 
 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd  = "fri2"
 KBRANCH_fri2-noemgd = "standard/fri2"
-SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2"
-SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f"
-
-LINUX_VERSION = "3.4.11"
+KERNEL_FEATURES_fri2-noemgd_append = " cfg/vesafb"
+SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
+SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
 
 module_autoload_iwlwifi = "iwlwifi"
+
+LINUX_VERSION = "3.4.28"
+
+SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"