summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-16 12:41:14 -0800
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-16 15:24:24 -0800
commit5e02959f5cb81784b08cb7e4e027c058089c1ee7 (patch)
treebd3f5023ba4200651e15da0fb0915d8306eaa762
parenta17f3f4e9c61a9317a013b11ee36686d3a62c98f (diff)
downloadmeta-intel-5e02959f5cb81784b08cb7e4e027c058089c1ee7.tar.gz
linux-intel/4.14: use master cache until named branch available
It wasn't appropriate to use the 4.9 cache for 4.14. This also brings in the following relevant commits: * b6b5ac8d x86-64: disable orc by default * 82743ab8 common-pc*.scc: Add igb to common-pc drivers * 6bcc7298 features/i915/i915.cfg: compile i915 as a module This adds Intel gigabit Ethernet drivers, fixes the i915 firmware load issue, and fixes an lttng-modules compilation failure with the new kernel due to the new CONFIG_UNWINDER_ORC=y default. Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r--recipes-kernel/linux/linux-intel_4.14.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb
index dd44aa1f..0d5dbdde 100644
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ b/recipes-kernel/linux/linux-intel_4.14.bb
@@ -1,14 +1,14 @@
1require linux-intel.inc 1require linux-intel.inc
2 2
3KBRANCH = "4.14/yocto/base" 3KBRANCH = "4.14/yocto/base"
4KMETA_BRANCH = "yocto-4.9" 4KMETA_BRANCH = "master"
5 5
6# Fix for 32-bit perf issue. Remove when patch is backported to 4.14. 6# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
7SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" 7SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
8 8
9LINUX_VERSION ?= "4.14.0" 9LINUX_VERSION ?= "4.14.0"
10SRCREV_machine ?= "bebc6082da0a9f5d47a1ea2edc099bf671058bd4" 10SRCREV_machine ?= "bebc6082da0a9f5d47a1ea2edc099bf671058bd4"
11SRCREV_meta ?= "f4e37e151102d89c4d0e110c88eb3b3c36bdeaa4" 11SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2"
12 12
13# For Crystalforest and Romley 13# For Crystalforest and Romley
14KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" 14KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"