diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-10-24 08:11:01 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-10-25 08:28:14 -0500 |
commit | 6e0d82eb19a00c04460b15b6df561f608f6460e4 (patch) | |
tree | 9b83d0e468ff9db85b4399b5edce760142ae2f73 | |
parent | eb64b1df5bb1f7c2f8077931029369f6f9105995 (diff) | |
download | meta-intel-6e0d82eb19a00c04460b15b6df561f608f6460e4.tar.gz |
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.conf | 2 | ||||
-rw-r--r-- | meta-chiefriver/conf/machine/chiefriver.conf | 2 | ||||
-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 | ||||
-rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 2 |
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" | |||
22 | SERIAL_CONSOLE = "115200 ttyS0" | 22 | SERIAL_CONSOLE = "115200 ttyS0" |
23 | APPEND += "console=ttyS0,115200 console=tty0" | 23 | APPEND += "console=ttyS0,115200 console=tty0" |
24 | 24 | ||
25 | VA_FEATURES = "gst-va-intel va-intel" | 25 | VA_FEATURES ?= "gst-va-intel va-intel" |
26 | 26 | ||
27 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 27 | 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} \ | |||
15 | ${XSERVER_IA32_I965} \ | 15 | ${XSERVER_IA32_I965} \ |
16 | " | 16 | " |
17 | 17 | ||
18 | VA_FEATURES = "gst-va-intel va-intel" | 18 | VA_FEATURES ?= "gst-va-intel va-intel" |
19 | 19 | ||
20 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" | 20 | 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" | |||
23 | 23 | ||
24 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 24 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" |
25 | 25 | ||
26 | VA_FEATURES = "gst-va-intel va-intel" | 26 | VA_FEATURES ?= "gst-va-intel va-intel" |
27 | 27 | ||
28 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 28 | 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 | |||
8 | require conf/machine/include/ia32-base.inc | 8 | require conf/machine/include/ia32-base.inc |
9 | require conf/machine/include/meta-intel.inc | 9 | 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 va-impl-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}" |
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} \ | |||
16 | ${XSERVER_IA32_I965} \ | 16 | ${XSERVER_IA32_I965} \ |
17 | " | 17 | " |
18 | 18 | ||
19 | VA_FEATURES = "gst-va-intel va-intel" | 19 | VA_FEATURES ?= "gst-va-intel va-intel" |
20 | 20 | ||
21 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 21 | 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" | |||
26 | SERIAL_CONSOLE = "115200 ttyS0" | 26 | SERIAL_CONSOLE = "115200 ttyS0" |
27 | APPEND += "console=ttyS0,115200 console=tty0" | 27 | APPEND += "console=ttyS0,115200 console=tty0" |
28 | 28 | ||
29 | VA_FEATURES = "gst-va-intel va-intel" | 29 | VA_FEATURES ?= "gst-va-intel va-intel" |
30 | 30 | ||
31 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | 31 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" |