summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-02-25 17:04:49 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-03-04 22:53:19 (GMT)
commit5b9c36be97095705c82bd36a524efc6171ea9af8 (patch)
treec8ae3decb1ac13035a867fbb2eab8d800f60436b
parent4ffe40409f8cd0f354a7488113ef888b42867033 (diff)
downloadmeta-intel-5b9c36be97095705c82bd36a524efc6171ea9af8.tar.gz
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>
-rw-r--r--meta-sys940x/README8
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
-rw-r--r--meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend4
3 files changed, 7 insertions, 7 deletions
diff --git a/meta-sys940x/README b/meta-sys940x/README
index 75bd7e0..be5bc0f 100644
--- a/meta-sys940x/README
+++ b/meta-sys940x/README
@@ -79,7 +79,7 @@ between BSPs) e.g.:
79The meta-sys940x layer contains support for two different machine 79The meta-sys940x layer contains support for two different machine
80configurations. These configurations are identical except for the fact 80configurations. These configurations are identical except for the fact
81that the one prefixed with 'sys940x' makes use of the Intel-proprietary 81that the one prefixed with 'sys940x' makes use of the Intel-proprietary
82EMGD 1.10 graphics driver, while the one prefixed with 'sys940x-noemgd' 82EMGD graphics driver, while the one prefixed with 'sys940x-noemgd'
83does not. 83does not.
84 84
85If you want to enable the layer that supports EMGD graphics add the 85If you want to enable the layer that supports EMGD graphics add the
@@ -89,10 +89,10 @@ following to the local.conf file:
89 89
90The 'sys940x' machine includes the emgd-driver-bin package, which has a 90The 'sys940x' machine includes the emgd-driver-bin package, which has a
91proprietary license that must be whitelisted by adding the string 91proprietary license that must be whitelisted by adding the string
92"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable 92"license_emgd-driver-bin" to the LICENSE_FLAGS_WHITELIST variable
93in your local.conf. For example: 93in your local.conf. For example:
94 94
95 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10" 95 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
96 96
97If you want to enable the layer that does not support EMGD graphics 97If you want to enable the layer that does not support EMGD graphics
98add the following to the local.conf file: 98add the following to the local.conf file:
@@ -114,7 +114,7 @@ added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
114 114
115For example: 115For example:
116 116
117 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial" 117 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial"
118 118
119The reason this is needed is to prevent the image from including 119The reason this is needed is to prevent the image from including
120anything that might violate the license terms of the packages used to 120anything 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 5ab592f..c4aa5db 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -26,7 +26,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
26PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 26PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
27PREFERRED_VERSION_mesa-dri ?= "9.0.2" 27PREFERRED_VERSION_mesa-dri ?= "9.0.2"
28PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 28PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
29PREFERRED_VERSION_emgd-driver-bin ?= "1.14" 29PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
30 30
31SERIAL_CONSOLE = "115200 ttyS0" 31SERIAL_CONSOLE = "115200 ttyS0"
32APPEND += "console=ttyS0,115200 console=tty0" 32APPEND += "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 541b0d8..121145b 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"
5COMPATIBLE_MACHINE_sys940x = "sys940x" 5COMPATIBLE_MACHINE_sys940x = "sys940x"
6KMACHINE_sys940x = "sys940x" 6KMACHINE_sys940x = "sys940x"
7KBRANCH_sys940x = "standard/base" 7KBRANCH_sys940x = "standard/base"
8KERNEL_FEATURES_sys940x = " features/drm-emgd" 8KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.16"
9 9
10COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd" 10COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
11KMACHINE_sys940x-noemgd = "sys940x" 11KMACHINE_sys940x-noemgd = "sys940x"
@@ -19,6 +19,6 @@ SRCREV_emgd_pn-linux-yocto_sys940x ?= "86643bdd8cbad616a161ab91f51108cf0da827bc"
19SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" 19SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
20SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" 20SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
21 21
22SRC_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" 22SRC_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"
23 23
24LINUX_VERSION = "3.4.28" 24LINUX_VERSION = "3.4.28"