From 50fa9bb12cb3b5e8b36041caaf5517f3eea8fde0 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 12 Mar 2014 10:30:54 -0700 Subject: Use intel-common-pkgarch for non-emgd BSPs Enable the intel-common pkgarch and machine override mechanism for most non-emgd BSPs. The Queensbay platforms show issues on the 3.10 kernel, and the NUC is experiencing some boot issues with the common kernel, so skip those for now. Signed-off-by: Darren Hart --- meta-crystalforest/conf/machine/crystalforest-gladden.conf | 1 + meta-crystalforest/conf/machine/crystalforest-server.conf | 1 + meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf | 1 + meta-jasperforest/conf/machine/jasperforest.conf | 1 + meta-n450/conf/machine/n450.conf | 3 ++- meta-romley/conf/machine/romley-ivb.conf | 1 + meta-romley/conf/machine/romley.conf | 1 + meta-sugarbay/conf/machine/sugarbay.conf | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/meta-crystalforest/conf/machine/crystalforest-gladden.conf b/meta-crystalforest/conf/machine/crystalforest-gladden.conf index c1b552a5..9c332938 100644 --- a/meta-crystalforest/conf/machine/crystalforest-gladden.conf +++ b/meta-crystalforest/conf/machine/crystalforest-gladden.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc require conf/machine/include/meta-intel.inc XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/meta-crystalforest/conf/machine/crystalforest-server.conf b/meta-crystalforest/conf/machine/crystalforest-server.conf index 7a5da09a..fd0e80a3 100644 --- a/meta-crystalforest/conf/machine/crystalforest-server.conf +++ b/meta-crystalforest/conf/machine/crystalforest-server.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc require conf/machine/include/meta-intel.inc XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf index e00ff9f1..21d01fbb 100644 --- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf +++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf @@ -12,6 +12,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.10%" MACHINE_FEATURES += "pcbios efi va-impl-intel" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc MACHINE_HWCODECS ?= "va-intel gst-va-intel" diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf index a258c20f..8dca1385 100644 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ b/meta-jasperforest/conf/machine/jasperforest.conf @@ -9,6 +9,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf index 9d976a91..fa45ecb6 100644 --- a/meta-n450/conf/machine/n450.conf +++ b/meta-n450/conf/machine/n450.conf @@ -6,9 +6,10 @@ #@DESCRIPTION: Machine configuration for Intel Embedded Development Board 1-N450 PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" +PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-core2-32-common.inc +require conf/machine/include/intel-common-pkgarch.inc XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ diff --git a/meta-romley/conf/machine/romley-ivb.conf b/meta-romley/conf/machine/romley-ivb.conf index f977c302..af528978 100644 --- a/meta-romley/conf/machine/romley-ivb.conf +++ b/meta-romley/conf/machine/romley-ivb.conf @@ -11,6 +11,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc require conf/machine/include/meta-intel.inc XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf index 60d2ca15..ed52a1ec 100644 --- a/meta-romley/conf/machine/romley.conf +++ b/meta-romley/conf/machine/romley.conf @@ -11,6 +11,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc require conf/machine/include/meta-intel.inc XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 988d5ffd..f2da68fb 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -11,6 +11,7 @@ MACHINE_FEATURES += "va-impl-intel" PREFERRED_VERSION_linux-yocto ?= "3.10%" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc MACHINE_HWCODECS ?= "va-intel gst-va-intel" -- cgit v1.2.3-54-g00ecf