diff options
author | George Nita <george.nita@enea.com> | 2015-10-04 05:11:58 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-10-04 05:11:58 +0200 |
commit | 385b6e75f1fe9c39c87ff179e6af8be4e80aa65f (patch) | |
tree | 11028cf6fcef77b1ec27b1718f2830c632191c5f | |
parent | 9e4c491105d191b064614d9255f467d552ea3362 (diff) | |
parent | 6e91701dcf68f9351db8bb0b92eb2d26af1b8f7f (diff) | |
download | meta-intel-385b6e75f1fe9c39c87ff179e6af8be4e80aa65f.tar.gz |
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 | |||
31 | M: Saul Wold <sgw@linux.intel.com> | 31 | M: Saul Wold <sgw@linux.intel.com> |
32 | F: common/ | 32 | F: common/ |
33 | 33 | ||
34 | CRYSTALFOREST | ||
35 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> | ||
36 | F: meta-crystalforest/ | ||
37 | |||
38 | TLK | 34 | TLK |
39 | M: Saul Wold <sgw@linux.intel.com> | 35 | M: Saul Wold <sgw@linux.intel.com> |
40 | F: meta-tlk/ | 36 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | LINUX_VERSION_core2-32-intel-common = "4.1.8" | ||
4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
5 | SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" | ||
6 | SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d" | ||
7 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
8 | KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" | ||
9 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" | ||
12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
13 | SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" | ||
14 | SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d" | ||
15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
16 | KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" | ||
17 | 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}:" | |||
2 | 2 | ||
3 | KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | 3 | KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" |
4 | 4 | ||
5 | LINUX_VERSION_core2-32-intel-common = "4.1.6" | 5 | LINUX_VERSION_core2-32-intel-common = "4.1.8" |
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
7 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 7 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
8 | KBRANCH_core2-32-intel-common = "standard/base" | 8 | KBRANCH_core2-32-intel-common = "standard/base" |
9 | SRCREV_meta_core2-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" | 9 | SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
10 | SRCREV_machine_core2-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" | 10 | SRCREV_machine_core2-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" |
11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
12 | 12 | ||
13 | LINUX_VERSION_corei7-64-intel-common = "4.1.6" | 13 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" |
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
16 | KBRANCH_corei7-64-intel-common = "standard/base" | 16 | KBRANCH_corei7-64-intel-common = "standard/base" |
17 | SRCREV_meta_corei7-64-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" | 17 | SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
18 | SRCREV_machine_corei7-64-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" | 18 | SRCREV_machine_corei7-64-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
20 | 20 | ||
21 | # Quark / X1000 BSP Info | 21 | # Quark / X1000 BSP Info |
22 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6" | 22 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8" |
23 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | 23 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" |
24 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | 24 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" |
25 | KBRANCH_i586-nlp-32-intel-common = "standard/base" | 25 | KBRANCH_i586-nlp-32-intel-common = "standard/base" |
26 | SRCREV_meta_i586-nlp-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" | 26 | SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
27 | SRCREV_machine_i586-nlp-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" | 27 | SRCREV_machine_i586-nlp-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" |
28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | 28 | KERNEL_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 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 | |||
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. |
11 | EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" | 11 | EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" |
12 | 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/ | |||
49 | VALLEYISLAND | 49 | VALLEYISLAND |
50 | M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> | 50 | M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
51 | F: meta-valleyisland/ | 51 | F: meta-valleyisland/ |
52 | |||
53 | CRYSTALFOREST | ||
54 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> | ||
55 | 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: | |||
71 | 71 | ||
72 | Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com> | 72 | Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com> |
73 | 73 | ||
74 | Please see the meta-intel/MAINTAINERS file for more details. | 74 | Please see the meta-isg/MAINTAINERS file for more details. |
75 | 75 | ||
76 | 76 | ||
77 | Table of Contents | 77 | Table of Contents |
@@ -98,7 +98,7 @@ bblayers.conf, along with the meta-intel layer itself (to access | |||
98 | common metadata shared between BSPs) e.g.: | 98 | common 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 | ||
103 | Crystal Forest layer is meant for building both Crystal Forest Gladden | 103 | Crystal Forest layer is meant for building both Crystal Forest Gladden |
104 | and Crystal Forest Server platforms. By enabling Crystal Forest layer, | 104 | and Crystal Forest Server platforms. By enabling Crystal Forest layer, |
@@ -197,8 +197,8 @@ IV. Enabling Intel DPDK and QuickAssist Technology | |||
197 | =================================================== | 197 | =================================================== |
198 | 198 | ||
199 | DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk | 199 | DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk |
200 | QAT recipe: meta-crystalforest/recipes-extended/qat | 200 | QAT recipe: meta-intel/meta-isg/common/recipes-extended/qat |
201 | QAT-enable zlib recipe: meta-crystalforest/recipes-extended/zlib-qat | 201 | QAT-enable zlib recipe: meta-intel/meta-isg/common/recipes-extended/zlib-qat |
202 | 202 | ||
203 | Note: | 203 | Note: |
204 | qat16 recipe is meant for platform with Coleto Creek chipset. | 204 | 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 @@ | |||
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 | ||
18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
19 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 19 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
20 | 20 | ||
21 | require conf/machine/include/intel-corei7-64-common.inc | 21 | require conf/machine/include/intel-corei7-64-common.inc |
22 | require conf/machine/include/intel-common-pkgarch.inc | 22 | 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 @@ | |||
4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems | 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
7 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 7 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
8 | 8 | ||
9 | require conf/machine/include/intel-core2-32-common.inc | 9 | require conf/machine/include/intel-core2-32-common.inc |
10 | require conf/machine/include/intel-common-pkgarch.inc | 10 | 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 @@ | |||
4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems | 4 | #@DESCRIPTION: Machine configuration for Mohon Peak systems |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
7 | PREFERRED_VERSION_linux-yocto ?= "3.14%" | 7 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
8 | 8 | ||
9 | require conf/machine/include/intel-corei7-64-common.inc | 9 | require conf/machine/include/intel-corei7-64-common.inc |
10 | require conf/machine/include/intel-common-pkgarch.inc | 10 | require conf/machine/include/intel-common-pkgarch.inc |