diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-03-12 10:30:54 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-03-12 14:51:00 -0700 |
commit | 50fa9bb12cb3b5e8b36041caaf5517f3eea8fde0 (patch) | |
tree | d4481f6785b970fffba852ee50e5c834f7a6997b | |
parent | fb2cbbc2de5c2fdaa32844624f7938725b2579cf (diff) | |
download | meta-intel-50fa9bb12cb3b5e8b36041caaf5517f3eea8fde0.tar.gz |
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 <dvhart@linux.intel.com>
-rw-r--r-- | meta-crystalforest/conf/machine/crystalforest-gladden.conf | 1 | ||||
-rw-r--r-- | meta-crystalforest/conf/machine/crystalforest-server.conf | 1 | ||||
-rw-r--r-- | meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf | 1 | ||||
-rw-r--r-- | meta-jasperforest/conf/machine/jasperforest.conf | 1 | ||||
-rw-r--r-- | meta-n450/conf/machine/n450.conf | 3 | ||||
-rw-r--r-- | meta-romley/conf/machine/romley-ivb.conf | 1 | ||||
-rw-r--r-- | meta-romley/conf/machine/romley.conf | 1 | ||||
-rw-r--r-- | meta-sugarbay/conf/machine/sugarbay.conf | 1 |
8 files changed, 9 insertions, 1 deletions
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" | |||
12 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 12 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
13 | 13 | ||
14 | require conf/machine/include/intel-corei7-64-common.inc | 14 | require conf/machine/include/intel-corei7-64-common.inc |
15 | require conf/machine/include/intel-common-pkgarch.inc | ||
15 | require conf/machine/include/meta-intel.inc | 16 | require conf/machine/include/meta-intel.inc |
16 | 17 | ||
17 | XSERVER ?= "${XSERVER_X86_BASE} \ | 18 | 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" | |||
12 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 12 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
13 | 13 | ||
14 | require conf/machine/include/intel-corei7-64-common.inc | 14 | require conf/machine/include/intel-corei7-64-common.inc |
15 | require conf/machine/include/intel-common-pkgarch.inc | ||
15 | require conf/machine/include/meta-intel.inc | 16 | require conf/machine/include/meta-intel.inc |
16 | 17 | ||
17 | XSERVER ?= "${XSERVER_X86_BASE} \ | 18 | 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%" | |||
12 | MACHINE_FEATURES += "pcbios efi va-impl-intel" | 12 | MACHINE_FEATURES += "pcbios efi va-impl-intel" |
13 | 13 | ||
14 | require conf/machine/include/intel-corei7-64-common.inc | 14 | require conf/machine/include/intel-corei7-64-common.inc |
15 | require conf/machine/include/intel-common-pkgarch.inc | ||
15 | 16 | ||
16 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" | 17 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" |
17 | 18 | ||
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 @@ | |||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
10 | 10 | ||
11 | require conf/machine/include/intel-corei7-64-common.inc | 11 | require conf/machine/include/intel-corei7-64-common.inc |
12 | require conf/machine/include/intel-common-pkgarch.inc | ||
12 | 13 | ||
13 | XSERVER ?= "${XSERVER_X86_BASE} \ | 14 | XSERVER ?= "${XSERVER_X86_BASE} \ |
14 | ${XSERVER_X86_EXT} \ | 15 | ${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 @@ | |||
6 | #@DESCRIPTION: Machine configuration for Intel Embedded Development Board 1-N450 | 6 | #@DESCRIPTION: Machine configuration for Intel Embedded Development Board 1-N450 |
7 | 7 | ||
8 | PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto" | 8 | PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto" |
9 | PREFERRED_VERSION_linux-yocto ?= "3.8%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
10 | 10 | ||
11 | require conf/machine/include/intel-core2-32-common.inc | 11 | require conf/machine/include/intel-core2-32-common.inc |
12 | require conf/machine/include/intel-common-pkgarch.inc | ||
12 | 13 | ||
13 | XSERVER ?= "${XSERVER_X86_BASE} \ | 14 | XSERVER ?= "${XSERVER_X86_BASE} \ |
14 | ${XSERVER_X86_EXT} \ | 15 | ${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 @@ | |||
11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
12 | 12 | ||
13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
14 | require conf/machine/include/intel-common-pkgarch.inc | ||
14 | require conf/machine/include/meta-intel.inc | 15 | require conf/machine/include/meta-intel.inc |
15 | 16 | ||
16 | XSERVER ?= "${XSERVER_X86_BASE} \ | 17 | 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 @@ | |||
11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
12 | 12 | ||
13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
14 | require conf/machine/include/intel-common-pkgarch.inc | ||
14 | require conf/machine/include/meta-intel.inc | 15 | require conf/machine/include/meta-intel.inc |
15 | 16 | ||
16 | XSERVER ?= "${XSERVER_X86_BASE} \ | 17 | 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" | |||
11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
12 | 12 | ||
13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
14 | require conf/machine/include/intel-common-pkgarch.inc | ||
14 | 15 | ||
15 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" | 16 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" |
16 | 17 | ||