aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-10-24 08:11:01 -0500
committerTom Zanussi <tom.zanussi@intel.com>2012-10-25 08:28:14 -0500
commit6e0d82eb19a00c04460b15b6df561f608f6460e4 (patch)
tree9b83d0e468ff9db85b4399b5edce760142ae2f73
parenteb64b1df5bb1f7c2f8077931029369f6f9105995 (diff)
downloadmeta-intel-6e0d82eb19a00c04460b15b6df561f608f6460e4.tar.gz
meta-intel-6e0d82eb19a00c04460b15b6df561f608f6460e4.tar.bz2
meta-intel-6e0d82eb19a00c04460b15b6df561f608f6460e4.zip
meta-intel: fix VA_FEATURES assignment in machine configs
commit 2231d38 (meta-intel: make video acceleration choice dependent on LICENSE_FLAGS) inadvertently also changed '?=' to a hard assignment, making it hard to override as intended. This changes it back. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-cedartrail/conf/machine/cedartrail.conf2
-rw-r--r--meta-chiefriver/conf/machine/chiefriver.conf2
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf2
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index d8b6bc0d..1463ae24 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -22,6 +22,6 @@ SYSLINUX_OPTS = "serial 0 115200"
SERIAL_CONSOLE = "115200 ttyS0"
APPEND += "console=ttyS0,115200 console=tty0"
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
index b8b87540..6d8d3a56 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -15,6 +15,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_I965} \
"
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index d56ef641..624ca56f 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -23,6 +23,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 587b976d..19f2fb0d 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,7 +8,7 @@ require conf/machine/include/tune-atom.inc
require conf/machine/include/ia32-base.inc
require conf/machine/include/meta-intel.inc
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 1d0e68da..616c2c5b 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -16,6 +16,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_I965} \
"
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index eefca59e..44de7962 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -26,6 +26,6 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
SERIAL_CONSOLE = "115200 ttyS0"
APPEND += "console=ttyS0,115200 console=tty0"
-VA_FEATURES = "gst-va-intel va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"