[meta-intel] [PATCH] intel-common: Specify linux-yocto and cleanup order

[Darren Hart]

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 at linux.intel.com>
---
 conf/machine/intel-core2-32.conf  |    5 +++--
 conf/machine/intel-corei7-64.conf |    5 +++--
 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 @@
 
 #@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.
 
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
-
 require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
+
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_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 @@
 
 #@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.
 
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
-
 require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
+
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g"
-- 
1.7.9.5