summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-03-16 12:48:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:25 +0000
commit99ad4c94131ec596bc959a0ff582817aed5f23ed (patch)
tree57822d36c8cedc5f01160fab50b01250286c51ab
parentc4f544ee13ce6c0f07c40d298bc4dcad9e448e02 (diff)
downloadpoky-99ad4c94131ec596bc959a0ff582817aed5f23ed.tar.gz
linux-yocto/4.1: powercap/RAPL: Backport powercap/RAPL
backporting the following powercap commits: 24e2e14aa446 powercap / RAPL: Enable Broxton RAPL support 6be05b47d625 powercap / RAPL: Add support for Skylake H/S 879e8d02e07d powercap / RAPL: Support Knights Landing ec583656ad93 powercap / RAPL: Floor frequency setting in Atom SoC (From OE-Core rev: 0c976d90781a1668c5f893d8c7f2509732679466) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb16
3 files changed, 10 insertions, 10 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 025aff1a1e..7a24b98151 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "da361d8a72a039a08e497b095a91905ccc8ae1d2" 5SRCREV_machine ?= "3216ec88ce3221d8f4744c84b6314458163493d9"
6SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" 6SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
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 e7facd2538..76fdf0dae4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 12SRCREV_machine ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
13SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" 13SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 0eecf99933..4c16873a27 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "c20a22ffa386e548069809884d9f0a20f9499469" 14SRCREV_machine_qemuarm ?= "6b5ee65b1f353c9b6a61402bfa6919f8f7a1969b"
15SRCREV_machine_qemuarm64 ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 15SRCREV_machine_qemuarm64 ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
16SRCREV_machine_qemumips ?= "b6e13683017f0e9b53df799e13bce196fdbbe665" 16SRCREV_machine_qemumips ?= "fb0ec85bc42dc0893440e825cbdb709c15bc1704"
17SRCREV_machine_qemuppc ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 17SRCREV_machine_qemuppc ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
18SRCREV_machine_qemux86 ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 18SRCREV_machine_qemux86 ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
19SRCREV_machine_qemux86-64 ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 19SRCREV_machine_qemux86-64 ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
20SRCREV_machine_qemumips64 ?= "ccfd34d494cbccfce581972fa348077d9257070d" 20SRCREV_machine_qemumips64 ?= "b9ee3a1ff68fbb978864203735b4d0e200ee50f4"
21SRCREV_machine ?= "00c73599b59d497539f10d6a61a419abb4183f2e" 21SRCREV_machine ?= "24e2e14aa446f6e4e127f2a0a004a72c430f337e"
22SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" 22SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \