diff options
| author | George Nita <george.nita@enea.com> | 2014-04-30 05:26:23 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2014-04-30 05:26:23 +0200 |
| commit | df9561721a075c978eebf73a8ee5acd02e95fc73 (patch) | |
| tree | 7464bdd20be978dc55d1c700a8e7304624a75d90 | |
| parent | 916c20b29d68898ae050fc0d3ff964ae8ea5de3b (diff) | |
| parent | 84eb1ba0e90d771f0d829aeb9e66a7fda395f65e (diff) | |
| download | meta-intel-df9561721a075c978eebf73a8ee5acd02e95fc73.tar.gz | |
Merge remote-tracking branch 'origin/daisy' into daisy-enea
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 5 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 5 | ||||
| -rw-r--r-- | meta-isg/meta-haswell-wc/README | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 5c3e714c..3c3d2901 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 | ||
| 6 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | ||
| 7 | |||
| 8 | require conf/machine/include/meta-intel.inc | 6 | require conf/machine/include/meta-intel.inc |
| 9 | require conf/machine/include/intel-core2-32-common.inc | 7 | require conf/machine/include/intel-core2-32-common.inc |
| 10 | require conf/machine/include/intel-common-pkgarch.inc | 8 | require conf/machine/include/intel-common-pkgarch.inc |
| 11 | 9 | ||
| 10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
| 11 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | ||
| 12 | |||
| 12 | MACHINE_FEATURES += "pcbios efi" | 13 | MACHINE_FEATURES += "pcbios efi" |
| 13 | MACHINE_FEATURES += "va-impl-intel" | 14 | MACHINE_FEATURES += "va-impl-intel" |
| 14 | MACHINE_FEATURES += "wifi 3g" | 15 | MACHINE_FEATURES += "wifi 3g" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 2d355542..c3b08bcc 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 | ||
| 6 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | ||
| 7 | |||
| 8 | require conf/machine/include/meta-intel.inc | 6 | require conf/machine/include/meta-intel.inc |
| 9 | require conf/machine/include/intel-corei7-64-common.inc | 7 | require conf/machine/include/intel-corei7-64-common.inc |
| 10 | require conf/machine/include/intel-common-pkgarch.inc | 8 | require conf/machine/include/intel-common-pkgarch.inc |
| 11 | 9 | ||
| 10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
| 11 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | ||
| 12 | |||
| 12 | MACHINE_FEATURES += "pcbios efi" | 13 | MACHINE_FEATURES += "pcbios efi" |
| 13 | MACHINE_FEATURES += "va-impl-intel" | 14 | MACHINE_FEATURES += "va-impl-intel" |
| 14 | MACHINE_FEATURES += "wifi 3g" | 15 | MACHINE_FEATURES += "wifi 3g" |
diff --git a/meta-isg/meta-haswell-wc/README b/meta-isg/meta-haswell-wc/README index 0f0af715..51829996 100644 --- a/meta-isg/meta-haswell-wc/README +++ b/meta-isg/meta-haswell-wc/README | |||
| @@ -47,7 +47,7 @@ Patches | |||
| 47 | ======= | 47 | ======= |
| 48 | 48 | ||
| 49 | Please submit any patches against this BSP to the Yocto mailing list | 49 | Please 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 | ||
| 52 | Maintainer: Ong Boon Leong <boon.leong.ong@intel.com> | 52 | Maintainer: Ong Boon Leong <boon.leong.ong@intel.com> |
| 53 | 53 | ||