2 files changed, 2 insertions, 66 deletions

diff --git a/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
deleted file mode 100644
index e3df8084..00000000
--- a/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001
-From: Changbin Du <changbin.du@gmail.com>
-Date: Tue, 28 Jan 2020 23:29:38 +0800
-Subject: [PATCH] perf: Make perf able to build with latest libbfd
-
-libbfd has changed the bfd_section_* macros to inline functions
-bfd_section_<field> since 2019-09-18. See below two commits:
-  o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
-  o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html
-
-This fix make perf able to build with both old and new libbfd.
-
-Upstream-Status: Submitted [commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream]
-
-Signed-off-by: Changbin Du <changbin.du@gmail.com>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
----
- tools/perf/util/srcline.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
-index 6ccf6f6d09df..5b7d6c16d33f 100644
---- a/tools/perf/util/srcline.c
-+++ b/tools/perf/util/srcline.c
-@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
-        bfd_vma pc, vma;
-        bfd_size_type size;
-        struct a2l_data *a2l = data;
-+       flagword flags;
- 
-        if (a2l->found)
-                return;
- 
--       if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-+#ifdef bfd_get_section_flags
-+       flags = bfd_get_section_flags(abfd, section);
-+#else
-+       flags = bfd_section_flags(section);
-+#endif
-+       if ((flags & SEC_ALLOC) == 0)
-                return;
- 
-        pc = a2l->addr;
-+#ifdef bfd_get_section_vma
-        vma = bfd_get_section_vma(abfd, section);
-+#else
-+       vma = bfd_section_vma(section);
-+#endif
-+#ifdef bfd_get_section_size
-        size = bfd_get_section_size(section);
-+#else
-+       size = bfd_section_size(section);
-+#endif
- 
-        if (pc < vma || pc >= vma + size)
-                return;
--- 
-2.17.1
-
diff --git a/recipes-kernel/linux/linux-qoriq_5.4.bb b/recipes-kernel/linux/linux-qoriq_5.4.bb
index 6a2f9c1f..54fd700c 100644
--- a/recipes-kernel/linux/linux-qoriq_5.4.bb
+++ b/recipes-kernel/linux/linux-qoriq_5.4.bb
@@ -1,15 +1,14 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-LINUX_VERSION = "5.4.3"
+LINUX_VERSION = "5.4.47"
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \
     file://0001-Makfefile-linux-5.4-add-warning-cflags-on-LSDK-20.04.patch \
-    file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \
     file://0001-perf-tests-bp_account-Make-global-variable-static.patch \
     file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
     file://0001-perf-bench-Share-some-global-variables-to-fix-build-.patch \
     file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
 "
-SRCREV = "134788b16485dd9fa81988681d2365ee38633fa2"
+SRCREV = "6bff40d413b394c2d742e7a42089bfc62aef0a9b"
 
 require recipes-kernel/linux/linux-qoriq.inc