summaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-03-02 23:01:29 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-03-06 21:06:27 (GMT)
commit8e971f7db71365410b3ba6a543eefc740477381d (patch)
tree61be4c2a1b0aa8eece253c759651ceeebc4a3864 /common/recipes-kernel/linux
parentf5aa708493d4f8285e76352699cf818fdc63ce12 (diff)
downloadmeta-intel-8e971f7db71365410b3ba6a543eefc740477381d.tar.gz
linux-intel: Update SRCREV
This updates SRCREV moves the kernel to 4.9.12 and adds a number of patches and backports for the Joule / 5xx series. The fix.cfg is a temporary fix until the DRM is more compeltely backported. Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-kernel/linux')
-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, 7 insertions, 2 deletions
diff --git a/common/recipes-kernel/linux/linux-intel/fix.cfg b/common/recipes-kernel/linux/linux-intel/fix.cfg
new file mode 100644
index 0000000..e30c189
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-intel/fix.cfg
@@ -0,0 +1,2 @@
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 a029ee1..67873f2 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -2,13 +2,16 @@
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KBRANCH = "base" 4KBRANCH = "base"
5SRCREV_machine ?= "a0ddfd76aa47a9760d1d0fd504f78c666b95e28d" 5SRCREV_machine ?= "21df0f902c89e4ec40742b4cc8d1b65382db19d8"
6SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99" 6SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
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.6" 11LINUX_VERSION ?= "4.9.12"
12
13# Temporary fix until DRM is properly backported
14SRC_URI += "file://fix.cfg"
12 15
13PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"
14 17