diff options
author | George Nita <george.nita@enea.com> | 2014-05-01 05:26:20 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2014-05-01 05:26:20 +0200 |
commit | 5d093e6f841cc82f072fd1b19573628392ca640a (patch) | |
tree | 8ff0499e7acbd5f3ad70d5db8010e5fc34fdfa0a | |
parent | df9561721a075c978eebf73a8ee5acd02e95fc73 (diff) | |
parent | 6ae8765812590327df5f2843b5542750a851d1bd (diff) | |
download | meta-intel-8d98c6007686e2c7b515619ff2b68cceac67418e.tar.gz |
Merge remote-tracking branch 'origin/daisy' into daisy-eneav4.0-rc1enea-linux-4.0-rc1
4 files changed, 10 insertions, 10 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index 9c1dd6af..ccfa876d 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -5,16 +5,16 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | |||
5 | 5 | ||
6 | LINUX_VERSION_core2-32-intel-common = "3.14.0" | 6 | LINUX_VERSION_core2-32-intel-common = "3.14.0" |
7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
8 | SRCREV_meta_core2-32-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 8 | SRCREV_meta_core2-32-intel-common = "ad5f23c47b299418a88f13b1e6f119602115804a" |
9 | SRCREV_machine_core2-32-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 9 | SRCREV_machine_core2-32-intel-common = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
11 | KBRANCH_core2-32-intel-common = "standard/base" | 11 | KBRANCH_core2-32-intel-common = "standard/base" |
12 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 12 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
13 | 13 | ||
14 | LINUX_VERSION_corei7-64-intel-common = "3.14.0" | 14 | LINUX_VERSION_corei7-64-intel-common = "3.14.0" |
15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
16 | SRCREV_meta_corei7-64-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 16 | SRCREV_meta_corei7-64-intel-common = "ad5f23c47b299418a88f13b1e6f119602115804a" |
17 | SRCREV_machine_corei7-64-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 17 | SRCREV_machine_corei7-64-intel-common = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
19 | KBRANCH_corei7-64-intel-common = "standard/base" | 19 | KBRANCH_corei7-64-intel-common = "standard/base" |
20 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 20 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend index 60ebd446..661cec8c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -6,5 +6,5 @@ KBRANCH_crownbay-noemgd = "standard/crownbay" | |||
6 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | 6 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" |
7 | 7 | ||
8 | LINUX_VERSION_crownbay-noemgd = "3.14.0" | 8 | LINUX_VERSION_crownbay-noemgd = "3.14.0" |
9 | SRCREV_machine_crownbay-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 9 | SRCREV_machine_crownbay-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
10 | SRCREV_meta_crownbay-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 10 | SRCREV_meta_crownbay-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend index 65df1a56..b2af1285 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -6,5 +6,5 @@ KBRANCH_emenlow-noemgd = "standard/emenlow" | |||
6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | 6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" |
7 | 7 | ||
8 | LINUX_VERSION_emenlow-noemgd = "3.14.0" | 8 | LINUX_VERSION_emenlow-noemgd = "3.14.0" |
9 | SRCREV_machine_emenlow-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 9 | SRCREV_machine_emenlow-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
10 | SRCREV_meta_emenlow-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 10 | SRCREV_meta_emenlow-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a" |
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend index 7098bacb..c0229663 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -5,7 +5,7 @@ KMACHINE_fri2-noemgd = "fri2" | |||
5 | KBRANCH_fri2-noemgd = "standard/fri2" | 5 | KBRANCH_fri2-noemgd = "standard/fri2" |
6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
7 | LINUX_VERSION_fri2-noemgd = "3.14.0" | 7 | LINUX_VERSION_fri2-noemgd = "3.14.0" |
8 | SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 8 | SRCREV_machine_fri2-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
9 | SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 9 | SRCREV_meta_fri2-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a" |
10 | 10 | ||
11 | module_autoload_iwlwifi = "iwlwifi" | 11 | module_autoload_iwlwifi = "iwlwifi" |