summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2014-04-30 03:26:23 (GMT)
committerGeorge Nita <george.nita@enea.com>2014-04-30 03:26:23 (GMT)
commitdf9561721a075c978eebf73a8ee5acd02e95fc73 (patch)
tree7464bdd20be978dc55d1c700a8e7304624a75d90
parent916c20b29d68898ae050fc0d3ff964ae8ea5de3b (diff)
parent84eb1ba0e90d771f0d829aeb9e66a7fda395f65e (diff)
downloadmeta-intel-df9561721a075c978eebf73a8ee5acd02e95fc73.tar.gz
Merge remote-tracking branch 'origin/daisy' into daisy-enea
-rw-r--r--conf/machine/intel-core2-32.conf5
-rw-r--r--conf/machine/intel-corei7-64.conf5
-rw-r--r--meta-isg/meta-haswell-wc/README2
3 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 5c3e714..3c3d290 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -3,12 +3,13 @@
3 3
4#@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. 4#@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5 5
6PREFERRED_VERSION_linux-yocto ?= "3.14%"
7
8require conf/machine/include/meta-intel.inc 6require conf/machine/include/meta-intel.inc
9require conf/machine/include/intel-core2-32-common.inc 7require conf/machine/include/intel-core2-32-common.inc
10require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
11 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "3.14%"
12
12MACHINE_FEATURES += "pcbios efi" 13MACHINE_FEATURES += "pcbios efi"
13MACHINE_FEATURES += "va-impl-intel" 14MACHINE_FEATURES += "va-impl-intel"
14MACHINE_FEATURES += "wifi 3g" 15MACHINE_FEATURES += "wifi 3g"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 2d35554..c3b08bc 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -3,12 +3,13 @@
3 3
4#@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. 4#@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5 5
6PREFERRED_VERSION_linux-yocto ?= "3.14%"
7
8require conf/machine/include/meta-intel.inc 6require conf/machine/include/meta-intel.inc
9require conf/machine/include/intel-corei7-64-common.inc 7require conf/machine/include/intel-corei7-64-common.inc
10require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
11 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "3.14%"
12
12MACHINE_FEATURES += "pcbios efi" 13MACHINE_FEATURES += "pcbios efi"
13MACHINE_FEATURES += "va-impl-intel" 14MACHINE_FEATURES += "va-impl-intel"
14MACHINE_FEATURES += "wifi 3g" 15MACHINE_FEATURES += "wifi 3g"
diff --git a/meta-isg/meta-haswell-wc/README b/meta-isg/meta-haswell-wc/README
index 0f0af71..5182999 100644
--- a/meta-isg/meta-haswell-wc/README
+++ b/meta-isg/meta-haswell-wc/README
@@ -47,7 +47,7 @@ Patches
47======= 47=======
48 48
49Please submit any patches against this BSP to the Yocto mailing list 49Please submit any patches against this BSP to the Yocto mailing list
50(yocto@yoctoproject.org) and cc: the maintainer: 50(meta-intel@yoctoproject.org) and cc: the maintainer:
51 51
52Maintainer: Ong Boon Leong <boon.leong.ong@intel.com> 52Maintainer: Ong Boon Leong <boon.leong.ong@intel.com>
53 53