Merge remote-tracking branch 'origin/master' into master-enea

16 files changed, 38 insertions, 20 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 79a021dc..443041d6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -31,10 +31,6 @@ COMMON
 M:      Saul Wold <sgw@linux.intel.com>
 F:      common/
 
-CRYSTALFOREST
-M:      Wu Chia Chuan <chia.chuan.wu@intel.com>
-F:      meta-crystalforest/
-
 TLK
 M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-tlk/
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
new file mode 100644
index 00000000..104da29d
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -0,0 +1,17 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+LINUX_VERSION_core2-32-intel-common = "4.1.8"
+COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
+SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
+KMACHINE_core2-32-intel-common = "intel-core2-32"
+KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
+KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+
+LINUX_VERSION_corei7-64-intel-common = "4.1.8"
+COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
+SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
+KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
+KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 8533ee82..0c384745 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -2,29 +2,29 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
-LINUX_VERSION_core2-32-intel-common = "4.1.6"
+LINUX_VERSION_core2-32-intel-common = "4.1.8"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/base"
-SRCREV_meta_core2-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
-SRCREV_machine_core2-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
+SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_machine_core2-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "4.1.6"
+LINUX_VERSION_corei7-64-intel-common = "4.1.8"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/base"
-SRCREV_meta_corei7-64-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
-SRCREV_machine_corei7-64-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
+SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_machine_corei7-64-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
 # Quark / X1000 BSP Info
-LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6"
+LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
 COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
 KMACHINE_i586-nlp-32-intel-common = "intel-quark"
 KBRANCH_i586-nlp-32-intel-common = "standard/base"
-SRCREV_meta_i586-nlp-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc"
-SRCREV_machine_i586-nlp-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1"
+SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_machine_i586-nlp-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
 KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
 
 
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc
index ac518bef..f7cfe146 100644
--- a/conf/machine/include/intel-quark-common.inc
+++ b/conf/machine/include/intel-quark-common.inc
@@ -9,3 +9,4 @@ require conf/machine/include/x86-base.inc
 # gnutls padlock code uses CMOV instruction in assembly which
 # is not valid for Quark.
 EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock"
+EXTRA_OECONF_append_pn-openssl_intel-quark = " no-asm" 
diff --git a/meta-isg/MAINTAINERS b/meta-isg/MAINTAINERS
index 98b8a5e0..36cef64f 100644
--- a/meta-isg/MAINTAINERS
+++ b/meta-isg/MAINTAINERS
@@ -49,3 +49,7 @@ F:	meta-mohonpeak/
 VALLEYISLAND
 M:      Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
 F:      meta-valleyisland/
+
+CRYSTALFOREST
+M:      Wu Chia Chuan <chia.chuan.wu@intel.com>
+F:      meta-crystalforest/
diff --git a/meta-crystalforest/COPYING.MIT b/meta-isg/meta-crystalforest/COPYING.MIT
index fb950dc6..fb950dc6 100644
--- a/meta-crystalforest/COPYING.MIT
+++ b/meta-isg/meta-crystalforest/COPYING.MIT
diff --git a/meta-crystalforest/README b/meta-isg/meta-crystalforest/README
index f549f907..48781056 100644
--- a/meta-crystalforest/README
+++ b/meta-isg/meta-crystalforest/README
@@ -71,7 +71,7 @@ list (meta-intel@yoctoproject.org) and cc: the maintainer:
 
 Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com>
 
-Please see the meta-intel/MAINTAINERS file for more details.
+Please see the meta-isg/MAINTAINERS file for more details.
 
 
 Table of Contents
@@ -98,7 +98,7 @@ bblayers.conf, along with the meta-intel layer itself (to access
 common metadata shared between BSPs) e.g.:
 
   yocto/meta-intel \
-  yocto/meta-intel/meta-crystalforest \
+  yocto/meta-intel/meta-isg/meta-crystalforest \
 
 Crystal Forest layer is meant for building both Crystal Forest Gladden
 and Crystal Forest Server platforms. By enabling Crystal Forest layer,
@@ -197,8 +197,8 @@ IV. Enabling Intel DPDK and QuickAssist Technology
 ===================================================
 
 DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk
-QAT recipe:  meta-crystalforest/recipes-extended/qat
-QAT-enable zlib recipe: meta-crystalforest/recipes-extended/zlib-qat
+QAT recipe:  meta-intel/meta-isg/common/recipes-extended/qat
+QAT-enable zlib recipe: meta-intel/meta-isg/common/recipes-extended/zlib-qat
 
 Note:
 qat16 recipe is meant for platform with Coleto Creek  chipset.
diff --git a/meta-crystalforest/README.sources b/meta-isg/meta-crystalforest/README.sources
index 0d4d849a..0d4d849a 100644
--- a/meta-crystalforest/README.sources
+++ b/meta-isg/meta-crystalforest/README.sources
diff --git a/meta-crystalforest/binary/.gitignore b/meta-isg/meta-crystalforest/binary/.gitignore
index e69de29b..e69de29b 100644
--- a/meta-crystalforest/binary/.gitignore
+++ b/meta-isg/meta-crystalforest/binary/.gitignore
diff --git a/meta-crystalforest/conf/layer.conf b/meta-isg/meta-crystalforest/conf/layer.conf
index daa2ba7c..daa2ba7c 100644
--- a/meta-crystalforest/conf/layer.conf
+++ b/meta-isg/meta-crystalforest/conf/layer.conf
diff --git a/meta-crystalforest/conf/machine/crystalforest.conf b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf
index 7716e56f..5cd73d7c 100644
--- a/meta-crystalforest/conf/machine/crystalforest.conf
+++ b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf
@@ -16,7 +16,7 @@
 # i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
 
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
index ffce0122..ffce0122 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
index ffce0122..ffce0122 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c7..72d991c7 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
index a103b0e8..afc933a1 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Mohon Peak systems
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
 
 require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
index d023c15d..4beab814 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Mohon Peak systems
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
 
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc