summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-06-18 12:00:59 -0700
committerTom Zanussi <tom.zanussi@linux.intel.com>2014-09-04 08:44:26 -0500
commita32802715354303eb06503039518555f7aa21535 (patch)
tree1cfb6daed974f577a0029ebb4d98de8f7fd2d17f
parentb89a7c533df4fa17d8c239e674b0af83253a65b6 (diff)
downloadmeta-intel-a32802715354303eb06503039518555f7aa21535.tar.gz
meta-intel BSPs: include meta-intel.inc
To get common intel BSP configurations such as user land microcode loading support, each Intel BSP configuration needs to include the meta-intel.inc file. With the exception of few, many of the meta-intel BSP configuration files already include the meta-intel.inc file. With this commit now, all the remaining BSPs from the meta-intel layer also include the meta-intel.inc file. The Intel platforms BSPs hosted outside of the meta-intel layer, such as minnow, need to include the meta-intel.inc file to get the common features from the meta-intel layer. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Reviewed-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf1
-rw-r--r--meta-emenlow/conf/machine/emenlow-noemgd.conf1
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf1
-rw-r--r--meta-jasperforest/conf/machine/jasperforest.conf1
-rw-r--r--meta-nuc/conf/machine/nuc.conf1
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf1
6 files changed, 6 insertions, 0 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 29dc4658..4b618a4a 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -8,6 +8,7 @@
8 8
9PREFERRED_VERSION_linux-yocto ?= "3.14%" 9PREFERRED_VERSION_linux-yocto ?= "3.14%"
10 10
11require conf/machine/include/meta-intel.inc
11require conf/machine/include/intel-core2-32-common.inc 12require conf/machine/include/intel-core2-32-common.inc
12require conf/machine/include/intel-common-pkgarch.inc 13require conf/machine/include/intel-common-pkgarch.inc
13 14
diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf
index d8e5a5e4..f5709f99 100644
--- a/meta-emenlow/conf/machine/emenlow-noemgd.conf
+++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf
@@ -8,6 +8,7 @@
8PREFERRED_VERSION_linux-yocto ?= "3.14%" 8PREFERRED_VERSION_linux-yocto ?= "3.14%"
9 9
10require conf/machine/include/intel-core2-32-common.inc 10require conf/machine/include/intel-core2-32-common.inc
11require conf/machine/include/meta-intel.inc
11 12
12XSERVER ?= "${XSERVER_X86_BASE} \ 13XSERVER ?= "${XSERVER_X86_BASE} \
13 ${XSERVER_X86_EXT} \ 14 ${XSERVER_X86_EXT} \
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 38454cc1..e61a9538 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -7,6 +7,7 @@
7 7
8require conf/machine/include/intel-core2-32-common.inc 8require conf/machine/include/intel-core2-32-common.inc
9require conf/machine/include/intel-common-pkgarch.inc 9require conf/machine/include/intel-common-pkgarch.inc
10require conf/machine/include/meta-intel.inc
10 11
11MACHINE_FEATURES += "wifi 3g pcbios efi" 12MACHINE_FEATURES += "wifi 3g pcbios efi"
12MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 13MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 216cca38..e524b633 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -8,6 +8,7 @@
8 8
9PREFERRED_VERSION_linux-yocto ?= "3.14%" 9PREFERRED_VERSION_linux-yocto ?= "3.14%"
10 10
11require conf/machine/include/meta-intel.inc
11require conf/machine/include/intel-corei7-64-common.inc 12require conf/machine/include/intel-corei7-64-common.inc
12require conf/machine/include/intel-common-pkgarch.inc 13require conf/machine/include/intel-common-pkgarch.inc
13 14
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf
index 2b1b9a31..790b88d1 100644
--- a/meta-nuc/conf/machine/nuc.conf
+++ b/meta-nuc/conf/machine/nuc.conf
@@ -9,6 +9,7 @@
9PREFERRED_VERSION_linux-yocto ?= "3.14%" 9PREFERRED_VERSION_linux-yocto ?= "3.14%"
10MACHINE_FEATURES += "va-impl-intel wifi efi" 10MACHINE_FEATURES += "va-impl-intel wifi efi"
11 11
12require conf/machine/include/meta-intel.inc
12require conf/machine/include/intel-corei7-64-common.inc 13require conf/machine/include/intel-corei7-64-common.inc
13require conf/machine/include/intel-common-pkgarch.inc 14require conf/machine/include/intel-common-pkgarch.inc
14 15
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 87bc91c5..de3b0026 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -10,6 +10,7 @@ MACHINE_FEATURES += "va-impl-intel"
10 10
11PREFERRED_VERSION_linux-yocto ?= "3.14%" 11PREFERRED_VERSION_linux-yocto ?= "3.14%"
12 12
13require conf/machine/include/meta-intel.inc
13require conf/machine/include/intel-corei7-64-common.inc 14require conf/machine/include/intel-corei7-64-common.inc
14require conf/machine/include/intel-common-pkgarch.inc 15require conf/machine/include/intel-common-pkgarch.inc
15 16