diff options
| author | George Nita <george.nita@enea.com> | 2015-09-25 05:11:58 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-09-25 05:11:58 +0200 |
| commit | 584147c3832229a6165c52b87138919926a74498 (patch) | |
| tree | 37a13b0b46de4ce2c5c9bd25b0dc90787340a432 | |
| parent | d0b8c49aa0e1e21abb716c52be09ef41c4fffbc6 (diff) | |
| parent | 5e218aeacace801c4f01a1db8c99ac8a51421661 (diff) | |
| download | meta-intel-584147c3832229a6165c52b87138919926a74498.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index bb789894..8533ee82 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
| @@ -6,16 +6,16 @@ LINUX_VERSION_core2-32-intel-common = "4.1.6" | |||
| 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 ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" | 9 | SRCREV_meta_core2-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" |
| 10 | SRCREV_machine_core2-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" | 10 | SRCREV_machine_core2-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" |
| 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.6" |
| 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 ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" | 17 | SRCREV_meta_corei7-64-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" |
| 18 | SRCREV_machine_corei7-64-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" | 18 | SRCREV_machine_corei7-64-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" |
| 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 |
| @@ -23,8 +23,8 @@ LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6" | |||
| 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 ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" | 26 | SRCREV_meta_i586-nlp-32-intel-common ?= "5ecf2a70fee383f13388a97086c4a8766fc9cbcc" |
| 27 | SRCREV_machine_i586-nlp-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" | 27 | SRCREV_machine_i586-nlp-32-intel-common ?= "79a31b9d23db126f8a6be3eb88fd683056a213f1" |
| 28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | 28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" |
| 29 | 29 | ||
| 30 | 30 | ||