summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-03-21 18:34:28 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-03-21 20:55:39 (GMT)
commit37d46e1319d336195fb2b638412c9910fdd1668d (patch)
tree77aa963d4c0f74676d6f423ce21a905249959c7c
parent23f676af450b53581eda7bae4cfff32291809b04 (diff)
downloadmeta-intel-37d46e1319d336195fb2b638412c9910fdd1668d.tar.gz
linux-intel: Update SRCREV to latest
This includes a update to 4.9.15 as well as a re-work of the DRM patch set The team increased their testing to handle allyes and allno configs so addressed the DRM fix.cfg patch. Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--common/recipes-kernel/linux/linux-intel/fix.cfg2
-rw-r--r--common/recipes-kernel/linux/linux-intel_4.9.bb7
2 files changed, 2 insertions, 7 deletions
diff --git a/common/recipes-kernel/linux/linux-intel/fix.cfg b/common/recipes-kernel/linux/linux-intel/fix.cfg
deleted file mode 100644
index e30c189..0000000
--- a/common/recipes-kernel/linux/linux-intel/fix.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
1# CONFIG_DRM_CIRRUS_QEMU is not set
2CONFIG_SYNC_FILE=y
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb
index b5c4589..46821a9 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -2,16 +2,13 @@
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KBRANCH = "base" 4KBRANCH = "base"
5SRCREV_machine ?= "21df0f902c89e4ec40742b4cc8d1b65382db19d8" 5SRCREV_machine ?= "6f425e57c6afaed5d61cd9b8abe898bae97f9374"
6SRCREV_meta ?= "b65e9b6153237e3ee898a01bc418c12f7404a681" 6SRCREV_meta ?= "b65e9b6153237e3ee898a01bc418c12f7404a681"
7 7
8SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ 8SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
10 10
11LINUX_VERSION ?= "4.9.12" 11LINUX_VERSION ?= "4.9.15"
12
13# Temporary fix until DRM is properly backported
14SRC_URI += "file://fix.cfg"
15 12
16PV = "${LINUX_VERSION}+git${SRCPV}" 13PV = "${LINUX_VERSION}+git${SRCPV}"
17 14