summaryrefslogtreecommitdiffstats
path: root/meta-isg/meta-haswell-wc
diff options
context:
space:
mode:
authorChan Wei Sern <wei.sern.chan@intel.com>2014-05-09 20:37:28 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-05-09 16:27:57 (GMT)
commitf53daca5f3e6656f36bc482f5cba82974fe87f5a (patch)
tree11f59dc72ba0915a966cf95cc6563b982a06497f /meta-isg/meta-haswell-wc
parent33bbe7c06ad2bceb39241abac2b8e33ff0c21fde (diff)
downloadmeta-intel-f53daca5f3e6656f36bc482f5cba82974fe87f5a.tar.gz
meta-haswell-wc: provide meta-intel.inc in machine configuration
This is to include meta-intel.inc in haswell-wc.conf. Also to include PREFERRED_PROVIDER for linux-yocto. Added APPEND to make video:effifb:off so that the SATO UI will not be freezed. Signed-off-by: Chan Wei Sern <wei.sern.chan@intel.com> Acked-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta-isg/meta-haswell-wc')
-rw-r--r--meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
index 21d01fb..6487cd2 100644
--- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
+++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
@@ -7,12 +7,14 @@
7#@DESCRIPTION: Machine configuration for "Walnut Canyon", 7#@DESCRIPTION: Machine configuration for "Walnut Canyon",
8# a Shark Bay development kit. 8# a Shark Bay development kit.
9 9
10 10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "3.10%" 11PREFERRED_VERSION_linux-yocto ?= "3.10%"
12
12MACHINE_FEATURES += "pcbios efi va-impl-intel" 13MACHINE_FEATURES += "pcbios efi va-impl-intel"
13 14
14require conf/machine/include/intel-corei7-64-common.inc 15require conf/machine/include/intel-corei7-64-common.inc
15require conf/machine/include/intel-common-pkgarch.inc 16require conf/machine/include/intel-common-pkgarch.inc
17require conf/machine/include/meta-intel.inc
16 18
17MACHINE_HWCODECS ?= "va-intel gst-va-intel" 19MACHINE_HWCODECS ?= "va-intel gst-va-intel"
18 20
@@ -20,3 +22,8 @@ XSERVER ?= "${XSERVER_X86_BASE} \
20 ${XSERVER_X86_EXT} \ 22 ${XSERVER_X86_EXT} \
21 ${XSERVER_X86_I965} \ 23 ${XSERVER_X86_I965} \
22 " 24 "
25
26#Since intel-common-standard.scc turn on CONFIG_FB_EFI
27#This Kernel Option is required in order to disable FB-EFI
28#If not the SATO image will be freezed.
29APPEND += "video=efifb:off"