mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-07 04:58:57 +00:00
arm-bsp/linux-yocto: remove old 5.6 recipe
This was only used by Corstone 700, so is redundant now. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
-38
@@ -1,38 +0,0 @@
|
|||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
|
|
||||||
From c139f8e8dc8a5388f63bf2cf1c17ee114dcdb919 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Sat, 25 Jul 2020 02:06:23 +0100
|
|
||||||
Subject: [PATCH 1/2] libtraceevent: Fix build with binutils 2.35
|
|
||||||
|
|
||||||
In binutils 2.35, 'nm -D' changed to show symbol versions along with
|
|
||||||
symbol names, with the usual @@ separator. When generating
|
|
||||||
libtraceevent-dynamic-list we need just the names, so strip off the
|
|
||||||
version suffix if present.
|
|
||||||
|
|
||||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
|
|
||||||
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
|
|
||||||
Cc: linux-trace-devel@vger.kernel.org
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
||||||
---
|
|
||||||
tools/lib/traceevent/plugins/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile
|
|
||||||
index 349bb81482ab..680d883efe05 100644
|
|
||||||
--- a/tools/lib/traceevent/plugins/Makefile
|
|
||||||
+++ b/tools/lib/traceevent/plugins/Makefile
|
|
||||||
@@ -197,7 +197,7 @@ define do_generate_dynamic_list_file
|
|
||||||
xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\
|
|
||||||
if [ "$$symbol_type" = "U W" ];then \
|
|
||||||
(echo '{'; \
|
|
||||||
- $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\
|
|
||||||
+ $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\
|
|
||||||
echo '};'; \
|
|
||||||
) > $2; \
|
|
||||||
else \
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
-69
@@ -1,69 +0,0 @@
|
|||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
|
|
||||||
From 9e752121f8d4edcde6f3fb466593eeaf6d8306b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leo Yan <leo.yan@linaro.org>
|
|
||||||
Date: Tue, 5 May 2020 21:36:42 +0800
|
|
||||||
Subject: [PATCH 2/2] perf cs-etm: Move definition of 'traceid_list' global
|
|
||||||
variable from header file
|
|
||||||
|
|
||||||
The variable 'traceid_list' is defined in the header file cs-etm.h,
|
|
||||||
if multiple C files include cs-etm.h the compiler might complaint for
|
|
||||||
multiple definition of 'traceid_list'.
|
|
||||||
|
|
||||||
To fix multiple definition error, move the definition of 'traceid_list'
|
|
||||||
into cs-etm.c.
|
|
||||||
|
|
||||||
Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata")
|
|
||||||
Reported-by: Thomas Backlund <tmb@mageia.org>
|
|
||||||
Signed-off-by: Leo Yan <leo.yan@linaro.org>
|
|
||||||
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
||||||
Reviewed-by: Mike Leach <mike.leach@linaro.org>
|
|
||||||
Tested-by: Mike Leach <mike.leach@linaro.org>
|
|
||||||
Tested-by: Thomas Backlund <tmb@mageia.org>
|
|
||||||
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
||||||
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
||||||
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
||||||
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
||||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
||||||
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
|
|
||||||
Cc: Tor Jeremiassen <tor@ti.com>
|
|
||||||
Cc: linux-arm-kernel@lists.infradead.org
|
|
||||||
Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org
|
|
||||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
||||||
---
|
|
||||||
tools/perf/util/cs-etm.c | 3 +++
|
|
||||||
tools/perf/util/cs-etm.h | 3 ---
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
|
|
||||||
index 5471045ebf5c..4d8efe96015b 100644
|
|
||||||
--- a/tools/perf/util/cs-etm.c
|
|
||||||
+++ b/tools/perf/util/cs-etm.c
|
|
||||||
@@ -94,6 +94,9 @@ struct cs_etm_queue {
|
|
||||||
struct cs_etm_traceid_queue **traceid_queues;
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* RB tree for quick conversion between traceID and metadata pointers */
|
|
||||||
+static struct intlist *traceid_list;
|
|
||||||
+
|
|
||||||
static int cs_etm__update_queues(struct cs_etm_auxtrace *etm);
|
|
||||||
static int cs_etm__process_queues(struct cs_etm_auxtrace *etm);
|
|
||||||
static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm,
|
|
||||||
diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
|
|
||||||
index 650ecc2a6349..4ad925d6d799 100644
|
|
||||||
--- a/tools/perf/util/cs-etm.h
|
|
||||||
+++ b/tools/perf/util/cs-etm.h
|
|
||||||
@@ -114,9 +114,6 @@ enum cs_etm_isa {
|
|
||||||
CS_ETM_ISA_T32,
|
|
||||||
};
|
|
||||||
|
|
||||||
-/* RB tree for quick conversion between traceID and metadata pointers */
|
|
||||||
-struct intlist *traceid_list;
|
|
||||||
-
|
|
||||||
struct cs_etm_queue;
|
|
||||||
|
|
||||||
struct cs_etm_packet {
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.6:"
|
|
||||||
|
|
||||||
SRC_URI:append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
|
|
||||||
file://0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch"
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
KBRANCH ?= "v5.6/standard/base"
|
|
||||||
|
|
||||||
require recipes-kernel/linux/linux-yocto.inc
|
|
||||||
|
|
||||||
SRCREV_machine = "cd5b55b99dab4da10ffd084f00f2ba088a74f45f"
|
|
||||||
SRCREV_meta = "b152cd93ea7046a835c869a76085aefdb6ce7421"
|
|
||||||
|
|
||||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
|
|
||||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.6;destsuffix=${KMETA}"
|
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
|
||||||
LINUX_VERSION = "5.6.19"
|
|
||||||
|
|
||||||
DEPENDS += "openssl-native util-linux-native"
|
|
||||||
|
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
|
||||||
|
|
||||||
KMETA = "kernel-meta"
|
|
||||||
KCONF_BSP_AUDIT_LEVEL = "1"
|
|
||||||
|
|
||||||
# Functionality flags
|
|
||||||
KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
|
|
||||||
Reference in New Issue
Block a user