diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-06-24 16:56:30 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:22:48 +0100 |
commit | b80b5433a32b6228e3d7d3fdee1f6a9b904179a7 (patch) | |
tree | 80c37d49dc12df749125438d692fff997710463d /meta | |
parent | 678a02e112bead7a5ef73c7e74ac2599a544de1f (diff) | |
download | poky-b80b5433a32b6228e3d7d3fdee1f6a9b904179a7.tar.gz |
linux-yocto/4.1/4.4: tpm, telemetry, acpi and cpuid changes
Backporting mainline and development commits to for various subystems.
linux-yocto: 4.4:
ae6a527d93f i2c: add support for ACPI reconfigure notifications
f2422e12af53 acpi: add support for ACPI reconfiguration notifiers
bc87718fdb56 acpi: fix enumeration (visited) flags for bus rescans
linux-yocto: 4.1:
9f166e918f63 platform:x86 decouple telemetry driver from the optional IPC resources
adfc21c1f156 tpm: update PPI documentation to address the location change.
661b0190e412 x86 tsc: enumerate BXT tsc_khz via CPUID
78be69fa9d15 x86 tsc: enumerate SKL cpu_khz and tsc_khz via CPUID
(From OE-Core rev: fdde7061108f04b04a82ba76205ce85afc543a6f)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Yu, Ong Hock <ong.hock.yu@intel.com>
Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 420fd74570..1b9154f8fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "65ea19da3cd94bb44de4b1dd5419ecc385e4e27d" | 14 | SRCREV_machine ?= "68484fa68d060d947fc46b2e85c0c6f2381d3e55" |
15 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" | 15 | SRCREV_meta ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 9cb41ba781..1757efd02f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.26" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 12 | SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
13 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" | 13 | SRCREV_meta ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 44e9d202ea..d3a4a66afa 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "a38cb0352686c01aabf2c81d2dfc823208635af0" | 14 | SRCREV_machine_qemuarm ?= "df8f2bd306f5e22590991faee46e28f671fa19b3" |
15 | SRCREV_machine_qemuarm64 ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 15 | SRCREV_machine_qemuarm64 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
16 | SRCREV_machine_qemumips ?= "482dc5fa137bb48f4198c81825499c2d505a226c" | 16 | SRCREV_machine_qemumips ?= "1bb60e693b913dacad698bec1cc08b350785e3d1" |
17 | SRCREV_machine_qemuppc ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 17 | SRCREV_machine_qemuppc ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
18 | SRCREV_machine_qemux86 ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 18 | SRCREV_machine_qemux86 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
19 | SRCREV_machine_qemux86-64 ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 19 | SRCREV_machine_qemux86-64 ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
20 | SRCREV_machine_qemumips64 ?= "f5489ee8c9420f67d91e95e19f57deda989bc829" | 20 | SRCREV_machine_qemumips64 ?= "b0e7bb69566a922a661c4902e496dce98cefeab9" |
21 | SRCREV_machine ?= "fb0153332a1fdd0518f9055ece1c53f3a99973f5" | 21 | SRCREV_machine ?= "9f166e918f63dd7214ad0388d64709d33f2a14a3" |
22 | SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" | 22 | SRCREV_meta ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |