summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-10-04 03:11:58 (GMT)
committerGeorge Nita <george.nita@enea.com>2015-10-04 03:11:58 (GMT)
commit385b6e75f1fe9c39c87ff179e6af8be4e80aa65f (patch)
tree11028cf6fcef77b1ec27b1718f2830c632191c5f
parent9e4c491105d191b064614d9255f467d552ea3362 (diff)
parent6e91701dcf68f9351db8bb0b92eb2d26af1b8f7f (diff)
downloadmeta-intel-385b6e75f1fe9c39c87ff179e6af8be4e80aa65f.tar.gz
Merge remote-tracking branch 'origin/master' into master-enea
-rw-r--r--MAINTAINERS4
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend17
-rw-r--r--common/recipes-kernel/linux/linux-yocto_4.1.bbappend18
-rw-r--r--conf/machine/include/intel-quark-common.inc1
-rw-r--r--meta-isg/MAINTAINERS4
-rw-r--r--meta-isg/meta-crystalforest/COPYING.MIT (renamed from meta-crystalforest/COPYING.MIT)0
-rw-r--r--meta-isg/meta-crystalforest/README (renamed from meta-crystalforest/README)8
-rw-r--r--meta-isg/meta-crystalforest/README.sources (renamed from meta-crystalforest/README.sources)0
-rw-r--r--meta-isg/meta-crystalforest/binary/.gitignore (renamed from meta-crystalforest/binary/.gitignore)0
-rw-r--r--meta-isg/meta-crystalforest/conf/layer.conf (renamed from meta-crystalforest/conf/layer.conf)0
-rw-r--r--meta-isg/meta-crystalforest/conf/machine/crystalforest.conf (renamed from meta-crystalforest/conf/machine/crystalforest.conf)2
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig)0
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig)0
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend)0
-rw-r--r--meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf2
-rw-r--r--meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf2
16 files changed, 38 insertions, 20 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 79a021d..443041d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -31,10 +31,6 @@ COMMON
31M: Saul Wold <sgw@linux.intel.com> 31M: Saul Wold <sgw@linux.intel.com>
32F: common/ 32F: common/
33 33
34CRYSTALFOREST
35M: Wu Chia Chuan <chia.chuan.wu@intel.com>
36F: meta-crystalforest/
37
38TLK 34TLK
39M: Saul Wold <sgw@linux.intel.com> 35M: Saul Wold <sgw@linux.intel.com>
40F: meta-tlk/ 36F: 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 0000000..104da29
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -0,0 +1,17 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3LINUX_VERSION_core2-32-intel-common = "4.1.8"
4COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
5SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
6SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
7KMACHINE_core2-32-intel-common = "intel-core2-32"
8KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
9KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
10
11LINUX_VERSION_corei7-64-intel-common = "4.1.8"
12COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
13SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
14SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
15KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
17KERNEL_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 8533ee8..0c38474 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}:"
2 2
3KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" 3KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
4 4
5LINUX_VERSION_core2-32-intel-common = "4.1.6" 5LINUX_VERSION_core2-32-intel-common = "4.1.8"
6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
7KMACHINE_core2-32-intel-common = "intel-core2-32" 7KMACHINE_core2-32-intel-common = "intel-core2-32"
8KBRANCH_core2-32-intel-common = "standard/base" 8KBRANCH_core2-32-intel-common = "standard/base"
9SRCREV_meta_core2-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 9SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
10SRCREV_machine_core2-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 10SRCREV_machine_core2-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
12 12
13LINUX_VERSION_corei7-64-intel-common = "4.1.6" 13LINUX_VERSION_corei7-64-intel-common = "4.1.8"
14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
15KMACHINE_corei7-64-intel-common = "intel-corei7-64" 15KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16KBRANCH_corei7-64-intel-common = "standard/base" 16KBRANCH_corei7-64-intel-common = "standard/base"
17SRCREV_meta_corei7-64-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 17SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
18SRCREV_machine_corei7-64-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 18SRCREV_machine_corei7-64-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
20 20
21# Quark / X1000 BSP Info 21# Quark / X1000 BSP Info
22LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6" 22LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
23COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" 23COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
24KMACHINE_i586-nlp-32-intel-common = "intel-quark" 24KMACHINE_i586-nlp-32-intel-common = "intel-quark"
25KBRANCH_i586-nlp-32-intel-common = "standard/base" 25KBRANCH_i586-nlp-32-intel-common = "standard/base"
26SRCREV_meta_i586-nlp-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" 26SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
27SRCREV_machine_i586-nlp-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" 27SRCREV_machine_i586-nlp-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
28KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" 28KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
29 29
30 30
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc
index ac518be..f7cfe14 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
9# gnutls padlock code uses CMOV instruction in assembly which 9# gnutls padlock code uses CMOV instruction in assembly which
10# is not valid for Quark. 10# is not valid for Quark.
11EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" 11EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock"
12EXTRA_OECONF_append_pn-openssl_intel-quark = " no-asm"
diff --git a/meta-isg/MAINTAINERS b/meta-isg/MAINTAINERS
index 98b8a5e..36cef64 100644
--- a/meta-isg/MAINTAINERS
+++ b/meta-isg/MAINTAINERS
@@ -49,3 +49,7 @@ F: meta-mohonpeak/
49VALLEYISLAND 49VALLEYISLAND
50M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> 50M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
51F: meta-valleyisland/ 51F: meta-valleyisland/
52
53CRYSTALFOREST
54M: Wu Chia Chuan <chia.chuan.wu@intel.com>
55F: meta-crystalforest/
diff --git a/meta-crystalforest/COPYING.MIT b/meta-isg/meta-crystalforest/COPYING.MIT
index fb950dc..fb950dc 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 f549f90..4878105 100644
--- a/meta-crystalforest/README
+++ b/meta-isg/meta-crystalforest/README
@@ -71,7 +71,7 @@ list (meta-intel@yoctoproject.org) and cc: the maintainer:
71 71
72Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com> 72Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com>
73 73
74Please see the meta-intel/MAINTAINERS file for more details. 74Please see the meta-isg/MAINTAINERS file for more details.
75 75
76 76
77Table of Contents 77Table of Contents
@@ -98,7 +98,7 @@ bblayers.conf, along with the meta-intel layer itself (to access
98common metadata shared between BSPs) e.g.: 98common metadata shared between BSPs) e.g.:
99 99
100 yocto/meta-intel \ 100 yocto/meta-intel \
101 yocto/meta-intel/meta-crystalforest \ 101 yocto/meta-intel/meta-isg/meta-crystalforest \
102 102
103Crystal Forest layer is meant for building both Crystal Forest Gladden 103Crystal Forest layer is meant for building both Crystal Forest Gladden
104and Crystal Forest Server platforms. By enabling Crystal Forest layer, 104and Crystal Forest Server platforms. By enabling Crystal Forest layer,
@@ -197,8 +197,8 @@ IV. Enabling Intel DPDK and QuickAssist Technology
197=================================================== 197===================================================
198 198
199DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk 199DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk
200QAT recipe: meta-crystalforest/recipes-extended/qat 200QAT recipe: meta-intel/meta-isg/common/recipes-extended/qat
201QAT-enable zlib recipe: meta-crystalforest/recipes-extended/zlib-qat 201QAT-enable zlib recipe: meta-intel/meta-isg/common/recipes-extended/zlib-qat
202 202
203Note: 203Note:
204qat16 recipe is meant for platform with Coleto Creek chipset. 204qat16 recipe is meant for platform with Coleto Creek chipset.
diff --git a/meta-crystalforest/README.sources b/meta-isg/meta-crystalforest/README.sources
index 0d4d849..0d4d849 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 e69de29..e69de29 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 daa2ba7..daa2ba7 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 7716e56..5cd73d7 100644
--- a/meta-crystalforest/conf/machine/crystalforest.conf
+++ b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf
@@ -16,7 +16,7 @@
16# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets 16# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
17 17
18PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 18PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
19PREFERRED_VERSION_linux-yocto ?= "3.14%" 19PREFERRED_VERSION_linux-yocto ?= "4.1%"
20 20
21require conf/machine/include/intel-corei7-64-common.inc 21require conf/machine/include/intel-corei7-64-common.inc
22require conf/machine/include/intel-common-pkgarch.inc 22require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
index ffce012..ffce012 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
index ffce012..ffce012 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/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 72d991c..72d991c 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 a103b0e..afc933a 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for Mohon Peak systems 4#@DESCRIPTION: Machine configuration for Mohon Peak systems
5 5
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
7PREFERRED_VERSION_linux-yocto ?= "3.14%" 7PREFERRED_VERSION_linux-yocto ?= "4.1%"
8 8
9require conf/machine/include/intel-core2-32-common.inc 9require conf/machine/include/intel-core2-32-common.inc
10require conf/machine/include/intel-common-pkgarch.inc 10require 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 d023c15..4beab81 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for Mohon Peak systems 4#@DESCRIPTION: Machine configuration for Mohon Peak systems
5 5
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
7PREFERRED_VERSION_linux-yocto ?= "3.14%" 7PREFERRED_VERSION_linux-yocto ?= "4.1%"
8 8
9require conf/machine/include/intel-corei7-64-common.inc 9require conf/machine/include/intel-corei7-64-common.inc
10require conf/machine/include/intel-common-pkgarch.inc 10require conf/machine/include/intel-common-pkgarch.inc