diff options
author | Chan Wei Sern <wei.sern.chan@intel.com> | 2014-05-10 04:37:28 +0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2014-05-09 11:27:57 -0500 |
commit | f53daca5f3e6656f36bc482f5cba82974fe87f5a (patch) | |
tree | 11f59dc72ba0915a966cf95cc6563b982a06497f /meta-isg/meta-haswell-wc | |
parent | 33bbe7c06ad2bceb39241abac2b8e33ff0c21fde (diff) | |
download | meta-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.conf | 9 |
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 21d01fbb..6487cd2f 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 | 10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | |
11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
12 | |||
12 | MACHINE_FEATURES += "pcbios efi va-impl-intel" | 13 | MACHINE_FEATURES += "pcbios efi va-impl-intel" |
13 | 14 | ||
14 | require conf/machine/include/intel-corei7-64-common.inc | 15 | require conf/machine/include/intel-corei7-64-common.inc |
15 | require conf/machine/include/intel-common-pkgarch.inc | 16 | require conf/machine/include/intel-common-pkgarch.inc |
17 | require conf/machine/include/meta-intel.inc | ||
16 | 18 | ||
17 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" | 19 | MACHINE_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. | ||
29 | APPEND += "video=efifb:off" | ||