diff options
| author | George Nita <george.nita@enea.com> | 2015-07-29 05:12:01 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-07-29 05:12:01 +0200 |
| commit | 46b382223d1427b70ab84f419f2739c06ace9c28 (patch) | |
| tree | 64682225e187ab7c8b5527693a7255e2221e14be /common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | |
| parent | 5d1aeecb9512fb2d79bb16c39f00098a7f4d4150 (diff) | |
| parent | b88b9629f7c02a6bf27d96577cb725077c711c50 (diff) | |
| download | meta-intel-46b382223d1427b70ab84f419f2739c06ace9c28.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend index a0b43150..dbf6841b 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | |||
| @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
| 2 | 2 | ||
| 3 | LINUX_VERSION_core2-32-intel-common = "3.14.36" | 3 | LINUX_VERSION_core2-32-intel-common = "3.14.36" |
| 4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 5 | SRCREV_meta_core2-32-intel-common = "162dfe3bb092c1a792e5ed224fe09672e9814b24" | 5 | SRCREV_meta_core2-32-intel-common = "c33d39561807e1073ca412f1c771f43e4da75994" |
| 6 | SRCREV_machine_core2-32-intel-common = "3fb54cf8f4c3254f628e6c4720fe3c731a9de0b2" | 6 | SRCREV_machine_core2-32-intel-common = "3fb54cf8f4c3254f628e6c4720fe3c731a9de0b2" |
| 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/preempt-rt/base" | 8 | KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" |
| @@ -10,7 +10,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
| 10 | 10 | ||
| 11 | LINUX_VERSION_corei7-64-intel-common = "3.14.36" | 11 | LINUX_VERSION_corei7-64-intel-common = "3.14.36" |
| 12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 13 | SRCREV_meta_corei7-64-intel-common = "162dfe3bb092c1a792e5ed224fe09672e9814b24" | 13 | SRCREV_meta_corei7-64-intel-common = "c33d39561807e1073ca412f1c771f43e4da75994" |
| 14 | SRCREV_machine_corei7-64-intel-common = "3fb54cf8f4c3254f628e6c4720fe3c731a9de0b2" | 14 | SRCREV_machine_corei7-64-intel-common = "3fb54cf8f4c3254f628e6c4720fe3c731a9de0b2" |
| 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/preempt-rt/base" | 16 | KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" |