machine: move PREFERRED_VERSION/PREFERRED_PROVIDER to meta-intel.inc

This information is the same across all meta-intel supported MACHINEs,
so we can move it to a shared location.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>

4 files changed, 3 insertions, 9 deletions

diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 7dc0095d..d5792e53 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -8,6 +8,9 @@
 # XSERVER subcomponents, used to build the XSERVER variable
 #
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "4.4%"
+
 # for Xserver older than 1.13.0
 OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 313df631..d9587c0d 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -7,9 +7,6 @@ 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 ?= "4.4%"
-
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index f63fb74e..1f28ba8c 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -7,9 +7,6 @@ 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 ?= "4.4%"
-
 MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
index 0717aae7..9db17a50 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -7,9 +7,6 @@ require conf/machine/include/meta-intel.inc
 require conf/machine/include/intel-quark-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "4.4%"
-
 #Avoid pulling in GRUB
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""