summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-08-16 18:51:13 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-18 11:44:55 +0100
commit196e8c6daf6be90e7eb7c330584f423ac6255ad8 (patch)
tree690915489f36e498db096ea866f89a6e7f18843c
parent7b732da82a6db589f469f6a42a7918e543de071f (diff)
downloadpoky-196e8c6daf6be90e7eb7c330584f423ac6255ad8.tar.gz
linux-yocto/5.4: perf cs-etm: Move definition of 'traceid_list' global variable from header file
Integrating the following commit(s) to linux-yocto/5.4: 706efec4c1e2 perf cs-etm: Move definition of 'traceid_list' global variable from header file (From OE-Core rev: 8e1d8c2099f29b45f1e96d4349731db036fb7548) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb18
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 2857dea130..cfe3277e83 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,7 +11,7 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "550d18f9ff5749c779261b01d61a86c7e79b06b6" 14SRCREV_machine ?= "22664d170488313b5c2713b6d9c8df6563387728"
15SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a" 15SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 78d57e1841..b90b1259a2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "919fb1aeb12bceab82f32139bec283c1bb5ebc1c" 18SRCREV_machine_qemuarm ?= "d192ae0b9995a7be2a33b12005a95348ec6aae94"
19SRCREV_machine ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 19SRCREV_machine ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
20SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a" 20SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index ba9c803947..f85e37d2c2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
12KBRANCH_qemux86-64 ?= "v5.4/standard/base" 12KBRANCH_qemux86-64 ?= "v5.4/standard/base"
13KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" 13KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "1f11670a455ce50f55597415afedfc5eaa3981bf" 15SRCREV_machine_qemuarm ?= "7bbd138602fda3d69d74674460e73bffdec73cd2"
16SRCREV_machine_qemuarm64 ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 16SRCREV_machine_qemuarm64 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
17SRCREV_machine_qemumips ?= "50557f1a2b606139ef5d6ba4a2f46ad7b7b2e96d" 17SRCREV_machine_qemumips ?= "e43ed1586cd85a007b0fae3c63d6980d4f5cb336"
18SRCREV_machine_qemuppc ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 18SRCREV_machine_qemuppc ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
19SRCREV_machine_qemuriscv64 ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 19SRCREV_machine_qemuriscv64 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
20SRCREV_machine_qemux86 ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 20SRCREV_machine_qemux86 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
21SRCREV_machine_qemux86-64 ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 21SRCREV_machine_qemux86-64 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
22SRCREV_machine_qemumips64 ?= "52e277a90804bb7ccef6e51bcf739d88788b4a69" 22SRCREV_machine_qemumips64 ?= "d1ff96887c64f70de00add62eb91d4c36f1b181a"
23SRCREV_machine ?= "7e20784a1d13af858f83a2d5f582fe30329553ce" 23SRCREV_machine ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
24SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a" 24SRCREV_meta ?= "83311f062f4aede9928eca82a34ddf73f264fe2a"
25 25
26# remap qemuarm to qemuarma15 for the 5.4 kernel 26# remap qemuarm to qemuarma15 for the 5.4 kernel