summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-10-27 05:12:03 +0100
committerGeorge Nita <george.nita@enea.com>2015-10-27 05:12:03 +0100
commit9a481280c62bccc7df442ffcc1f69badacb04251 (patch)
treeb033100d5abb09b3a36872771e04523dafbc7a8e
parent57c61fd48b417e790b2e65f359f2de370eb42310 (diff)
parent42cd81d2058e957b0dd223f6017687e134f6c21f (diff)
downloadmeta-intel-master-enea.tar.gz
Merge remote-tracking branch 'origin/master' into master-eneamaster-enea
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend8
-rw-r--r--common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend4
-rw-r--r--common/recipes-kernel/linux/linux-yocto_4.1.bbappend6
3 files changed, 9 insertions, 9 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
index 104da29d..cf45c616 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -2,16 +2,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION_core2-32-intel-common = "4.1.8" 3LINUX_VERSION_core2-32-intel-common = "4.1.8"
4COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 4COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
5SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 5SRCREV_meta_core2-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
6SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d" 6SRCREV_machine_core2-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
7KMACHINE_core2-32-intel-common = "intel-core2-32" 7KMACHINE_core2-32-intel-common = "intel-core2-32"
8KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" 8KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
9KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 9KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
10 10
11LINUX_VERSION_corei7-64-intel-common = "4.1.8" 11LINUX_VERSION_corei7-64-intel-common = "4.1.8"
12COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 12COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
13SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 13SRCREV_meta_corei7-64-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
14SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d" 14SRCREV_machine_corei7-64-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
15KMACHINE_corei7-64-intel-common = "intel-corei7-64" 15KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" 16KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
17KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 17KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index ce97f1cc..d2a1c3c8 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3#LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2" 3#LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2"
4COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" 4COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
5SRCREV_meta_i586-nlp-32-intel-common = "429f9e2ff0649b8c9341345622545d874d5e303a" 5SRCREV_meta-nlp-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
6SRCREV_machine_i586-nlp-32-intel-common = "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" 6SRCREV_machine-nlp-32-intel-common = "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
7KBRANCH_i586-nlp-32-intel-common = "standard/tiny/common-pc" 7KBRANCH_i586-nlp-32-intel-common = "standard/tiny/common-pc"
8KMACHINE_i586-nlp-32-intel-common = "intel-quark" 8KMACHINE_i586-nlp-32-intel-common = "intel-quark"
9KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 9KERNEL_FEATURES_append_i586-nlp-32-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 6c3d784e..75adf920 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -6,7 +6,7 @@ LINUX_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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 9SRCREV_meta_core2-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
10SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 10SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
12 12
@@ -14,7 +14,7 @@ LINUX_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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 17SRCREV_meta_corei7-64-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
18SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 18SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
20 20
@@ -23,7 +23,7 @@ LINUX_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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" 26SRCREV_meta_i586-nlp-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
27SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 27SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
28KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" 28KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
29 29