summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2016-01-27 20:51:14 (GMT)
committerSaul Wold <sgw@linux.intel.com>2016-02-22 22:53:15 (GMT)
commitaaab29ad036b13a0959925329b2b8e471869ca53 (patch)
tree4fd712547b029c0f0e563a18d2078f39a9a3ee00 /conf
parent95e3bea7f64813fa765bb4e68bea4c8490dbd8e0 (diff)
downloadmeta-intel-aaab29ad036b13a0959925329b2b8e471869ca53.tar.gz
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/meta-intel.inc3
-rw-r--r--conf/machine/intel-core2-32.conf3
-rw-r--r--conf/machine/intel-corei7-64.conf3
-rw-r--r--conf/machine/intel-quark.conf3
4 files changed, 3 insertions, 9 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 7dc0095..d5792e5 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -8,6 +8,9 @@
8# XSERVER subcomponents, used to build the XSERVER variable 8# XSERVER subcomponents, used to build the XSERVER variable
9# 9#
10 10
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
12PREFERRED_VERSION_linux-yocto ?= "4.4%"
13
11# for Xserver older than 1.13.0 14# for Xserver older than 1.13.0
12OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \ 15OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
13 xserver-xorg-extension-dri2 \ 16 xserver-xorg-extension-dri2 \
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 313df63..d9587c0 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
7require conf/machine/include/intel-core2-32-common.inc 7require conf/machine/include/intel-core2-32-common.inc
8require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
9 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "4.4%"
12
13MACHINE_FEATURES += "pcbios efi" 10MACHINE_FEATURES += "pcbios efi"
14MACHINE_FEATURES += "va-impl-intel" 11MACHINE_FEATURES += "va-impl-intel"
15MACHINE_FEATURES += "wifi 3g nfc" 12MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index f63fb74..1f28ba8 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
7require conf/machine/include/intel-corei7-64-common.inc 7require conf/machine/include/intel-corei7-64-common.inc
8require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
9 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "4.4%"
12
13MACHINE_FEATURES += "pcbios efi" 10MACHINE_FEATURES += "pcbios efi"
14MACHINE_FEATURES += "va-impl-intel" 11MACHINE_FEATURES += "va-impl-intel"
15MACHINE_FEATURES += "wifi 3g nfc" 12MACHINE_FEATURES += "wifi 3g nfc"
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
index 0717aae..9db17a5 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -7,9 +7,6 @@ require conf/machine/include/meta-intel.inc
7require conf/machine/include/intel-quark-common.inc 7require conf/machine/include/intel-quark-common.inc
8require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
9 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "4.4%"
12
13#Avoid pulling in GRUB 10#Avoid pulling in GRUB
14MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" 11MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
15 12