summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-04-10 00:55:49 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2014-04-29 21:13:27 (GMT)
commit84eb1ba0e90d771f0d829aeb9e66a7fda395f65e (patch)
tree38a765843a4caa4578a7b93110cae561cf6f79b8
parent3cd9b682a1e21e354c76ce938519ef548d72c3b6 (diff)
downloadmeta-intel-84eb1ba0e90d771f0d829aeb9e66a7fda395f65e.tar.gz
intel-common: Specify linux-yocto and cleanup order
In keeping with the other BSPs in meta-intel, specify the PREFERRED_PROVIDER and the PREFERRED_VERSION for the linux-yocto kernel to 3.14. Move the assignments below the required includes in keeping with the rest of meta-intel. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf5
-rw-r--r--conf/machine/intel-corei7-64.conf5
2 files changed, 6 insertions, 4 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"