summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2016-07-08 01:50:01 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2016-07-07 23:20:16 (GMT)
commit8b0a89027ae8954faac51ac0cff856e05d305594 (patch)
treee7d2c05d34b9a49d74a7e637bd62a6e6d81b7fe7 /common
parentd037f2add48ae9e325fa59aaec8c910ff91dac1e (diff)
downloadmeta-intel-8b0a89027ae8954faac51ac0cff856e05d305594.tar.gz
linux-yocto/4.4: Update SRCREVs for more Broxton fixes and features
From linux-yocto-4.4: c49ed01 Merge branch 'standard/base' into standard/intel/base 0e30a74 cpumask: Export cpumask_any_but() c2c0034 Merge branch 'standard/base' into standard/intel/base 26d9c4e x86 tsc: enumerate BXT tsc_khz via CPUID c8237a6 x86 tsc: enumerate SKL cpu_khz and tsc_khz via CPUID From yocto-kernel-cache: 01ac19e mei.cfg: mei driver is no longer in staging 614e45f bsp/intel-common: add keyboard-gpio to intel-common-drivers 612332b features/thermal: Enable Intel PMIC thermal feature ef96a88 broxton: Enable USB Type C feature for broxton 4ebb8be mei.cfg: Add CONFIG_INTEL_MEI_TXE=m 6f6ffd0 features/thermal: enable Intel powerclamp driver 8ee5212 broxton: set CONFIG_GPIO_GENERIC_PLATFORM instead of CONFIG_GPIO_GENERIC Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'common')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend4
-rw-r--r--common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend4
-rw-r--r--common/recipes-kernel/linux/linux-yocto_4.4.bbappend4
3 files changed, 6 insertions, 6 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
index 941a132..854f4c8 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -1,8 +1,8 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION_INTEL_COMMON = "4.4.13" 3LINUX_VERSION_INTEL_COMMON = "4.4.13"
4SRCREV_META_INTEL_COMMON ?= "44a610517357619a9ba827a597eef6d7f6e079f3" 4SRCREV_META_INTEL_COMMON ?= "01ac19ede037b753d2b3f0adb20ab1becb7e1511"
5SRCREV_MACHINE_INTEL_COMMON ?= "d78b7b79190b0db0c26158f929260f1d65b5d1c9" 5SRCREV_MACHINE_INTEL_COMMON ?= "48a6b4a41355d7f3e707847d54a92b784d89e408"
6 6
7KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" 7KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base"
8 8
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
index 41999eb..46660cc 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
@@ -1,8 +1,8 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3#LINUX_VERSION_i586-nlp-32-intel-common = "4.4.13" 3#LINUX_VERSION_i586-nlp-32-intel-common = "4.4.13"
4SRCREV_meta_i586-nlp-32-intel-common = "44a610517357619a9ba827a597eef6d7f6e079f3" 4SRCREV_meta_i586-nlp-32-intel-common = "01ac19ede037b753d2b3f0adb20ab1becb7e1511"
5SRCREV_machine_i586-nlp-32-intel-common = "13852755ecbf491848afbe40e66fc152bc70915b" 5SRCREV_machine_i586-nlp-32-intel-common = "0e30a74f2cbbab0c7014561fe4eab1c9d8bfe560"
6 6
7COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" 7COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
8KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base" 8KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base"
diff --git a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
index 3d177cb..c014086 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -1,8 +1,8 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION_INTEL_COMMON = "4.4.13" 3LINUX_VERSION_INTEL_COMMON = "4.4.13"
4SRCREV_META_INTEL_COMMON = "44a610517357619a9ba827a597eef6d7f6e079f3" 4SRCREV_META_INTEL_COMMON = "01ac19ede037b753d2b3f0adb20ab1becb7e1511"
5SRCREV_MACHINE_INTEL_COMMON = "2ae6a527d93f4f03697771c792dbda8701a8b57c" 5SRCREV_MACHINE_INTEL_COMMON = "c49ed01a7e4c4fe9bfe4a4548480afd27d51088d"
6 6
7KBRANCH_INTEL_COMMON = "standard/intel/base" 7KBRANCH_INTEL_COMMON = "standard/intel/base"
8KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" 8KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"