From 84eb1ba0e90d771f0d829aeb9e66a7fda395f65e Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 9 Apr 2014 17:55:49 -0700 Subject: 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 --- conf/machine/intel-corei7-64.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf/machine/intel-corei7-64.conf') 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 @@ #@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" -- cgit v1.2.3-54-g00ecf