summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2014-05-01 03:26:20 (GMT)
committerGeorge Nita <george.nita@enea.com>2014-05-01 03:26:20 (GMT)
commit5d093e6f841cc82f072fd1b19573628392ca640a (patch)
tree8ff0499e7acbd5f3ad70d5db8010e5fc34fdfa0a
parentdf9561721a075c978eebf73a8ee5acd02e95fc73 (diff)
parent6ae8765812590327df5f2843b5542750a851d1bd (diff)
downloadmeta-intel-5d093e6f841cc82f072fd1b19573628392ca640a.tar.gz
Merge remote-tracking branch 'origin/daisy' into daisy-eneav4.0-rc1enea-linux-4.0-rc1
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.14.bbappend8
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend4
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend4
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 9c1dd6a..ccfa876 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
6LINUX_VERSION_core2-32-intel-common = "3.14.0" 6LINUX_VERSION_core2-32-intel-common = "3.14.0"
7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
8SRCREV_meta_core2-32-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 8SRCREV_meta_core2-32-intel-common = "ad5f23c47b299418a88f13b1e6f119602115804a"
9SRCREV_machine_core2-32-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 9SRCREV_machine_core2-32-intel-common = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
10KMACHINE_core2-32-intel-common = "intel-core2-32" 10KMACHINE_core2-32-intel-common = "intel-core2-32"
11KBRANCH_core2-32-intel-common = "standard/base" 11KBRANCH_core2-32-intel-common = "standard/base"
12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
13 13
14LINUX_VERSION_corei7-64-intel-common = "3.14.0" 14LINUX_VERSION_corei7-64-intel-common = "3.14.0"
15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
16SRCREV_meta_corei7-64-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 16SRCREV_meta_corei7-64-intel-common = "ad5f23c47b299418a88f13b1e6f119602115804a"
17SRCREV_machine_corei7-64-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 17SRCREV_machine_corei7-64-intel-common = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
18KMACHINE_corei7-64-intel-common = "intel-corei7-64" 18KMACHINE_corei7-64-intel-common = "intel-corei7-64"
19KBRANCH_corei7-64-intel-common = "standard/base" 19KBRANCH_corei7-64-intel-common = "standard/base"
20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 20KERNEL_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 60ebd44..661cec8 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"
6KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" 6KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
7 7
8LINUX_VERSION_crownbay-noemgd = "3.14.0" 8LINUX_VERSION_crownbay-noemgd = "3.14.0"
9SRCREV_machine_crownbay-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 9SRCREV_machine_crownbay-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
10SRCREV_meta_crownbay-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 10SRCREV_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 65df1a5..b2af128 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"
6KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 6KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
7 7
8LINUX_VERSION_emenlow-noemgd = "3.14.0" 8LINUX_VERSION_emenlow-noemgd = "3.14.0"
9SRCREV_machine_emenlow-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 9SRCREV_machine_emenlow-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
10SRCREV_meta_emenlow-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 10SRCREV_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 7098bac..c022966 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"
5KBRANCH_fri2-noemgd = "standard/fri2" 5KBRANCH_fri2-noemgd = "standard/fri2"
6KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 6KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
7LINUX_VERSION_fri2-noemgd = "3.14.0" 7LINUX_VERSION_fri2-noemgd = "3.14.0"
8SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 8SRCREV_machine_fri2-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
9SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 9SRCREV_meta_fri2-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a"
10 10
11module_autoload_iwlwifi = "iwlwifi" 11module_autoload_iwlwifi = "iwlwifi"