linux-intel: Update 4.9 SRCREV and refactor

This has a SRCREV update to bring linux-intel to HEAD with some
audio and pnp patches.

The refactor moves the selection of branch to the versioned recipe
so we can have a shared linux-intel-lts repo with multiple LTS version
branches.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
(cherry picked from commit 8d37591e1186dcfbf679c1db660d6f9ffa41bb39)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>

3 files changed, 14 insertions, 10 deletions

diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
index 02192735..7a14c053 100644
--- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
@@ -10,8 +10,11 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
 }
 
-KBRANCH = "base-rt"
-SRCREV_machine ?= "44f76edc2079f1551be33b8ab473349d00f814a7"
-SRCREV_meta ?= "3d5b27b2d138b71052a1d17a5cca73aa0ec75328"
+KBRANCH = "4.9/yocto/base-rt"
+KMETA_BRANCH = "yocto-4.9"
+
+LINUX_VERSION ?= "4.9.61"
+SRCREV_machine ?= "8eb1a43e7232c412673aaaeb968b02122e42de4d"
+SRCREV_meta ?= "3e7fedea919b2c59801ceca25f57a23710ebadcd"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/common/recipes-kernel/linux/linux-intel.inc b/common/recipes-kernel/linux/linux-intel.inc
index 1f26d451..bde24ba5 100644
--- a/common/recipes-kernel/linux/linux-intel.inc
+++ b/common/recipes-kernel/linux/linux-intel.inc
@@ -3,17 +3,15 @@ require recipes-kernel/linux/linux-yocto.inc
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
 
 KERNEL_CONFIG_URI ?= " \
-                     git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA} \
+                     git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \
                    "
 SRC_URI = " \
-           git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \
+           git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
            ${KERNEL_CONFIG_URI} \
           "
 
 SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
 
-
-LINUX_VERSION ?= "4.9.56"
 LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb
index ec239242..85cb9bbe 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -1,9 +1,12 @@
 
 require linux-intel.inc
 
-KBRANCH = "base"
-SRCREV_machine ?= "e8405acd549563650e2e4774a49e069d161e8fe1"
-SRCREV_meta ?= "3d5b27b2d138b71052a1d17a5cca73aa0ec75328"
+KBRANCH = "4.9/yocto/base"
+KMETA_BRANCH = "yocto-4.9"
+
+LINUX_VERSION ?= "4.9.61"
+SRCREV_machine ?= "03469c2e703e40ed42ed72f415fd27c7d7f7f8cf"
+SRCREV_meta ?= "3e7fedea919b2c59801ceca25f57a23710ebadcd"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"