From a32802715354303eb06503039518555f7aa21535 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 18 Jun 2014 12:00:59 -0700 Subject: 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 Reviewed-by: Darren Hart Signed-off-by: Tom Zanussi --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 1 + meta-emenlow/conf/machine/emenlow-noemgd.conf | 1 + meta-fri2/conf/machine/fri2-noemgd.conf | 1 + meta-jasperforest/conf/machine/jasperforest.conf | 1 + meta-nuc/conf/machine/nuc.conf | 1 + meta-sugarbay/conf/machine/sugarbay.conf | 1 + 6 files changed, 6 insertions(+) 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 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" +require conf/machine/include/meta-intel.inc require conf/machine/include/intel-core2-32-common.inc require conf/machine/include/intel-common-pkgarch.inc 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 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" require conf/machine/include/intel-core2-32-common.inc +require conf/machine/include/meta-intel.inc XSERVER ?= "${XSERVER_X86_BASE} \ ${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 @@ require conf/machine/include/intel-core2-32-common.inc require conf/machine/include/intel-common-pkgarch.inc +require conf/machine/include/meta-intel.inc MACHINE_FEATURES += "wifi 3g pcbios efi" MACHINE_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 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" +require conf/machine/include/meta-intel.inc require conf/machine/include/intel-corei7-64-common.inc require conf/machine/include/intel-common-pkgarch.inc 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 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" MACHINE_FEATURES += "va-impl-intel wifi efi" +require conf/machine/include/meta-intel.inc require conf/machine/include/intel-corei7-64-common.inc require conf/machine/include/intel-common-pkgarch.inc 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" PREFERRED_VERSION_linux-yocto ?= "3.14%" +require conf/machine/include/meta-intel.inc require conf/machine/include/intel-corei7-64-common.inc require conf/machine/include/intel-common-pkgarch.inc -- cgit v1.2.3-54-g00ecf