diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-07-19 14:46:41 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-30 16:28:19 -0500 |
commit | 2a7a46cad31df8c8c7559d2d55c905ac23a56b65 (patch) | |
tree | 018445ea7142aaa181c48dd00380565b04a1b007 | |
parent | 756571750b0449335ef01279ce10609099b8a8e1 (diff) | |
download | meta-intel-2a7a46cad31df8c8c7559d2d55c905ac23a56b65.tar.gz |
meta-intel: use va-impl-intel MACHINE_FEATURE
Explicitly specify the va-impl-intel MACHINE_FEATURE, and update the
mixvideo uses with the feature rename.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r-- | meta-chiefriver/conf/machine/chiefriver.conf | 1 | ||||
-rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 2 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 2 | ||||
-rw-r--r-- | meta-sugarbay/conf/machine/sugarbay.conf | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf index b644119c..6d8d3a56 100644 --- a/meta-chiefriver/conf/machine/chiefriver.conf +++ b/meta-chiefriver/conf/machine/chiefriver.conf | |||
@@ -5,6 +5,7 @@ | |||
5 | # i.e. Ivy Bridge + Panther Point | 5 | # i.e. Ivy Bridge + Panther Point |
6 | 6 | ||
7 | PREFERRED_VERSION_linux-yocto ?= "3.4%" | 7 | PREFERRED_VERSION_linux-yocto ?= "3.4%" |
8 | MACHINE_FEATURES += "va-impl-intel" | ||
8 | 9 | ||
9 | require conf/machine/include/tune-x86_64.inc | 10 | require conf/machine/include/tune-x86_64.inc |
10 | require conf/machine/include/ia32-base.inc | 11 | require conf/machine/include/ia32-base.inc |
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index dba735a4..c4b7682d 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
@@ -10,7 +10,7 @@ require conf/machine/include/tune-atom.inc | |||
10 | require conf/machine/include/ia32-base.inc | 10 | require conf/machine/include/ia32-base.inc |
11 | require conf/machine/include/meta-intel.inc | 11 | require conf/machine/include/meta-intel.inc |
12 | 12 | ||
13 | MACHINE_FEATURES += "gst-va-mixvideo" | 13 | MACHINE_FEATURES += "va-impl-mixvideo" |
14 | 14 | ||
15 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 15 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
16 | ${XSERVER_IA32_EXT} \ | 16 | ${XSERVER_IA32_EXT} \ |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index a928f0f0..56408f7e 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -10,7 +10,7 @@ require conf/machine/include/meta-intel.inc | |||
10 | 10 | ||
11 | VA_FEATURES ?= "gst-va-intel va-intel" | 11 | VA_FEATURES ?= "gst-va-intel va-intel" |
12 | 12 | ||
13 | MACHINE_FEATURES += "wifi 3g pcbios efi gst-va-mixvideo" | 13 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
14 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 14 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |
15 | 15 | ||
16 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 16 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index a80c938d..616c2c5b 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf | |||
@@ -4,6 +4,8 @@ | |||
4 | #@DESCRIPTION: Machine configuration for Sugar Bay systems | 4 | #@DESCRIPTION: Machine configuration for Sugar Bay systems |
5 | # i.e. Sandy Bridge + Cougar Point | 5 | # i.e. Sandy Bridge + Cougar Point |
6 | 6 | ||
7 | MACHINE_FEATURES += "va-impl-intel" | ||
8 | |||
7 | PREFERRED_VERSION_linux-yocto ?= "3.4%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.4%" |
8 | 10 | ||
9 | require conf/machine/include/tune-x86_64.inc | 11 | require conf/machine/include/tune-x86_64.inc |