sys940x: use EMGD version 1.16 instead of 1.14

The link for the source tarball of the emgd 1.14 driver is not working
anymore. Also the sys940x BSP should also use the latest EMGD driver
like rest of the EMGD based BSPs.

This partly addresses:
[YOCTO #3809]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/meta-sys940x/README b/meta-sys940x/README
index 75bd7e00..be5bc0fc 100644
--- a/meta-sys940x/README
+++ b/meta-sys940x/README
@@ -79,7 +79,7 @@ between BSPs) e.g.:
 The meta-sys940x layer contains support for two different machine
 configurations. These configurations are identical except for the fact
 that the one prefixed with 'sys940x' makes use of the Intel-proprietary
-EMGD 1.10 graphics driver, while the one prefixed with 'sys940x-noemgd'
+EMGD graphics driver, while the one prefixed with 'sys940x-noemgd'
 does not.
 
 If you want to enable the layer that supports EMGD graphics add the
@@ -89,10 +89,10 @@ following to the local.conf file:
 
 The 'sys940x' machine includes the emgd-driver-bin package, which has a
 proprietary license that must be whitelisted by adding the string
-"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable
+"license_emgd-driver-bin" to the LICENSE_FLAGS_WHITELIST variable
 in your local.conf.  For example:
 
-  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
 
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
@@ -114,7 +114,7 @@ added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
 
 For example:
 
-  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial"
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial"
 
 The reason this is needed is to prevent the image from including
 anything that might violate the license terms of the packages used to
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 5ab592ff..c4aa5db6 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -26,7 +26,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "9.0.2"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 541b0d8a..121145bc 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -5,7 +5,7 @@ KMETA = "meta"
 COMPATIBLE_MACHINE_sys940x = "sys940x"
 KMACHINE_sys940x  = "sys940x"
 KBRANCH_sys940x  = "standard/base"
-KERNEL_FEATURES_sys940x = " features/drm-emgd"
+KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.16"
 
 COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
 KMACHINE_sys940x-noemgd  = "sys940x"
@@ -19,6 +19,6 @@ SRCREV_emgd_pn-linux-yocto_sys940x ?= "86643bdd8cbad616a161ab91f51108cf0da827bc"
 SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
 SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
 
-SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.14;name=machine,meta,emgd"
+SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
 
 LINUX_VERSION = "3.4.28"