[meta-intel] [patch v3 3/4] emenlow: use emgd 1.16 driver for graphics

[Tom Zanussi]

On Wed, 2013-01-23 at 09:17 -0800, nitin.a.kamble at intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble at intel.com>
> 
> Move from 1.14 version to 1.16 version of the emgd driver for
> graphics support.
> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> ---
>  meta-emenlow/README                                |    6 +++---
>  meta-emenlow/conf/machine/emenlow.conf             |    2 +-
>  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-emenlow/README b/meta-emenlow/README
> index b8b4210..6cc06fe 100644
> --- a/meta-emenlow/README
> +++ b/meta-emenlow/README
> @@ -83,7 +83,7 @@ common metadata shared between BSPs) e.g.:
>    yocto/meta-intel/meta-emenlow \
>  
>  The meta-emenlow layer contains support for the 'emenlow' machine
> -configuration, which makes use of the Intel-proprietary EMGD 1.14
> +configuration, which makes use of the Intel-proprietary EMGD 1.16
>  graphics driver.
>  
>  To enable the emenlow layer, add the emenlow MACHINE to local.conf:
> @@ -92,10 +92,10 @@ To enable the emenlow layer, add the emenlow MACHINE to local.conf:
>  
>  The 'emenlow' 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.14" to the LICENSE_FLAGS_WHITELIST variable
> +"license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST variable
>  in your local.conf.  For example:
>  
> -  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14"
> +  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16"
>  
>  You should then be able to build an emenlow image as such:
>  

Does emenlow require the same License flags for video as the other EMGD
BSPs?

They all have an additional paragraph describing 'commercial' and the
additional line for that:

LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16 commercial"

Does emenlow also need that text?

Tom

> diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
> index dc9fde8..a3c4086 100644
> --- a/meta-emenlow/conf/machine/emenlow.conf
> +++ b/meta-emenlow/conf/machine/emenlow.conf
> @@ -22,7 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
>  PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
>  PREFERRED_VERSION_mesa-dri ?= "7.11"
>  PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
> -PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
> +PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
>  
>  APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
>  
> diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
> index d370024..3eff5dd 100644
> --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
> +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend
> @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  COMPATIBLE_MACHINE_emenlow = "emenlow"
>  KMACHINE_emenlow  = "emenlow"
>  KBRANCH_emenlow  = "standard/emenlow"
> -KERNEL_FEATURES_emenlow_append = " features/drm-emgd cfg/vesafb"
> +KERNEL_FEATURES_emenlow_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
>  
>  COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
>  KMACHINE_emenlow-noemgd  = "emenlow"
> @@ -17,4 +17,4 @@ SRCREV_emgd_pn-linux-yocto_emenlow ?= "${AUTOREV}"
>  SRCREV_machine_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}"
>  SRCREV_meta_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}"
>  
> -SRC_URI_emenlow = "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_emenlow = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"