mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge pull request #4399 from HiassofT/le10-kernel-5.4.42+
linux (RPi): update to 5.4.42+
This commit is contained in:
Christian Hewitt
GitHub
commit
970d57b8a0
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="62fc8c01165a80021054a430182b504f7b877c2d"
|
||||
PKG_SHA256="00cd04ae1c5b73de10e1a189b2b643fa349f08f06324d966227f147e72243bd9"
|
||||
PKG_VERSION="cb2b95d73e9f0b1ebf05e03bb1959603d982feeb"
|
||||
PKG_SHA256="814b1e012513f08b9e4a4a72fd37d2a3d2ba4b8fd5aeb0bb093e87b0085b5c21"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -23,8 +23,8 @@ case "$LINUX" in
|
||||
PKG_PATCH_DIRS="amlogic"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="7048ac9fd3b918d83a71caf5c94bb061a2866794" # 5.4.42
|
||||
PKG_SHA256="758eaeab008092013eb79ac5cda422f8d49cf76245910887ca9c27eb0d4ccf49"
|
||||
PKG_VERSION="d00cdd80abb2a8c201cae2f6bd80e27eb2f7d347" # 5.4.45
|
||||
PKG_SHA256="4c6e5c458dfd07c8557afaedb54ad037f8d35c741f297a1b92ed796c69dec9de"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
From mboxrd@z Thu Jan 1 00:00:00 1970
|
||||
Return-Path: <SRS0=OrIQ=3R=vger.kernel.org=linux-kernel-owner@kernel.org>
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
||||
aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
|
||||
DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
|
||||
HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
|
||||
SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no
|
||||
version=3.4.0
|
||||
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
|
||||
by smtp.lore.kernel.org (Postfix) with ESMTP id 15B3FC33CB2
|
||||
for <linux-kernel@archiver.kernel.org>; Tue, 28 Jan 2020 15:29:57 +0000 (UTC)
|
||||
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||
by mail.kernel.org (Postfix) with ESMTP id DC2FA207FD
|
||||
for <linux-kernel@archiver.kernel.org>; Tue, 28 Jan 2020 15:29:56 +0000 (UTC)
|
||||
Authentication-Results: mail.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oudfIJtO"
|
||||
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S1726687AbgA1P34 (ORCPT
|
||||
<rfc822;linux-kernel@archiver.kernel.org>);
|
||||
Tue, 28 Jan 2020 10:29:56 -0500
|
||||
Received: from mail-pj1-f68.google.com ([209.85.216.68]:52776 "EHLO
|
||||
mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||
with ESMTP id S1725881AbgA1P3z (ORCPT
|
||||
<rfc822;linux-kernel@vger.kernel.org>);
|
||||
Tue, 28 Jan 2020 10:29:55 -0500
|
||||
Received: by mail-pj1-f68.google.com with SMTP id a6so1139461pjh.2
|
||||
for <linux-kernel@vger.kernel.org>; Tue, 28 Jan 2020 07:29:54 -0800 (PST)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=gmail.com; s=20161025;
|
||||
h=from:to:cc:subject:date:message-id:mime-version
|
||||
:content-transfer-encoding;
|
||||
bh=gYDQt040okirqe50Lrh3CEKmMOXPeZIYhDIO12JRm+M=;
|
||||
b=oudfIJtO2XN4XvD+DQ8Ec3GIHqxMMk6ogkt8jzO33dudjAqdner4DPznSzh1Y7XrBd
|
||||
ezD2ltpelFCHW3JRZgyfZqHAfW3s8KrKPaSSHQbDDQ7OXq3O+jtATKp0lwiThA4nB0uC
|
||||
BigxCmlYdVAHdBtxBc59/KBRJsff1bIIF2ifAGCQEx7s/wndc9NORpanY5iLzy/VqDpT
|
||||
Ja69ofWRIG1rsaAVpLA39lPLIkPyHjgG2/lirDlSXtlepON3OBYI/vPcMNV1OVcd5Maf
|
||||
8hFcwuDd5SEU+oue9keSK6X4vxGhivjKuT3Hz03+l8HEs3uZw+qK8Vd992Nm4wuWg47y
|
||||
MbWQ==
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20161025;
|
||||
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
|
||||
:content-transfer-encoding;
|
||||
bh=gYDQt040okirqe50Lrh3CEKmMOXPeZIYhDIO12JRm+M=;
|
||||
b=A+s6wicuBVjcyP6oBJZcS0KkG8ps96rhnWKHa1DiKP6idYSTKnhlUlbHwRDnS45vY3
|
||||
EylYoM/iamGhD0lwUkgXn9y092J/xDRX81UC0xAivoh2XSrJ5QMoS26yAlLo+F6U7e97
|
||||
uYE2j5To+D+SwSdy78AwCLhcUALkraL7+IKkuLepgQ9CRqslm2ucLbMlsfen4ur6HzGv
|
||||
hnGYhhI5Vr3RzUX/UYsfwMiT+klZsgtaKiXLiG/N+uKRPVbkfRYAA9jyv5EY9vtZHcMX
|
||||
erWdta535FrzMEzbh1DSLezGLCbppqrpyRa48xixZSCwty4lZyD/lQ5GiGc2Eb6OBpH5
|
||||
yXJA==
|
||||
X-Gm-Message-State: APjAAAWM554O6B18uKkyZR8xnKm0z5Pkt4u46QfadBN1BW++FYYtNsS/
|
||||
If4S1DoJJuqU2CuBGLwTQNk=
|
||||
X-Google-Smtp-Source: APXvYqwBUq02rMUM31o3VOkfKkq08ooJejdl8gGvivEbHXaXtorSAN7XrAd3mphmADoU5Yi8R+kxTw==
|
||||
X-Received: by 2002:a17:902:aa0b:: with SMTP id be11mr22410567plb.181.1580225394577;
|
||||
Tue, 28 Jan 2020 07:29:54 -0800 (PST)
|
||||
Received: from localhost.localdomain ([149.248.6.217])
|
||||
by smtp.gmail.com with ESMTPSA id y6sm20632148pgc.10.2020.01.28.07.29.51
|
||||
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||
Tue, 28 Jan 2020 07:29:54 -0800 (PST)
|
||||
From: Changbin Du <changbin.du@gmail.com>
|
||||
To: Peter Zijlstra <peterz@infradead.org>,
|
||||
Ingo Molnar <mingo@redhat.com>,
|
||||
Arnaldo Carvalho de Melo <acme@kernel.org>,
|
||||
Jiri Olsa <jolsa@redhat.com>
|
||||
Cc: linux-kernel@vger.kernel.org, Changbin Du <changbin.du@gmail.com>
|
||||
Subject: [PATCH] perf: Make perf able to build with latest libbfd
|
||||
Date: Tue, 28 Jan 2020 23:29:38 +0800
|
||||
Message-Id: <20200128152938.31413-1-changbin.du@gmail.com>
|
||||
X-Mailer: git-send-email 2.24.0
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Sender: linux-kernel-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
Archived-At: <https://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com/>
|
||||
List-Archive: <https://lore.kernel.org/lkml/>
|
||||
List-Post: <mailto:linux-kernel@vger.kernel.org>
|
||||
|
||||
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.
|
||||
|
||||
Signed-off-by: Changbin Du <changbin.du@gmail.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.24.0
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="62fc8c01165a80021054a430182b504f7b877c2d"
|
||||
PKG_SHA256="3587caa082981f007c236c2ca15538f772c20309a00b25d979ce12f346c6f68a"
|
||||
PKG_VERSION="cb2b95d73e9f0b1ebf05e03bb1959603d982feeb"
|
||||
PKG_SHA256="e223022bf48ba55aecbcb0013f98cb50ef449daffcfb96cf9af48c5b61e85869"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="rpi-eeprom"
|
||||
PKG_VERSION="ad18a5b468f787ed37ab62e0a699dabeaa580e27"
|
||||
PKG_SHA256="2f77ef84d34f77208e4caf90aa65bbbaa6234ee58ffe9c23a819d44c25a631b4"
|
||||
PKG_VERSION="2a8c2e77c34d16554956e5ca56697eba9611d2ad"
|
||||
PKG_SHA256="3982aa10f45f3dcd80d6072db0ddf27d76d4fbf2e9cdb08304ba32a953d55c8b"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="BSD-3/custom"
|
||||
PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
|
||||
|
||||
@ -2410,7 +2410,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
# Broadcom thermal drivers
|
||||
#
|
||||
CONFIG_BCM2835_THERMAL=y
|
||||
# CONFIG_BRCMSTB_THERMAL is not set
|
||||
# end of Broadcom thermal drivers
|
||||
|
||||
CONFIG_WATCHDOG=y
|
||||
@ -3184,7 +3183,7 @@ CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
CONFIG_DRM_FBDEV_OVERALLOC=100
|
||||
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
|
||||
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
|
||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||
# CONFIG_DRM_DP_CEC is not set
|
||||
CONFIG_DRM_GEM_CMA_HELPER=y
|
||||
CONFIG_DRM_KMS_CMA_HELPER=y
|
||||
|
||||
@ -2538,8 +2538,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
#
|
||||
# Broadcom thermal drivers
|
||||
#
|
||||
# CONFIG_BCM2711_THERMAL is not set
|
||||
CONFIG_BCM2835_THERMAL=y
|
||||
# CONFIG_BRCMSTB_THERMAL is not set
|
||||
# end of Broadcom thermal drivers
|
||||
|
||||
CONFIG_WATCHDOG=y
|
||||
@ -3314,7 +3314,7 @@ CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
CONFIG_DRM_FBDEV_OVERALLOC=100
|
||||
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
|
||||
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
|
||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||
# CONFIG_DRM_DP_CEC is not set
|
||||
CONFIG_DRM_GEM_CMA_HELPER=y
|
||||
CONFIG_DRM_KMS_CMA_HELPER=y
|
||||
|
||||
@ -2964,8 +2964,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
#
|
||||
# Broadcom thermal drivers
|
||||
#
|
||||
CONFIG_BCM2711_THERMAL=y
|
||||
CONFIG_BCM2835_THERMAL=y
|
||||
CONFIG_BRCMSTB_THERMAL=y
|
||||
# end of Broadcom thermal drivers
|
||||
|
||||
CONFIG_WATCHDOG=y
|
||||
@ -3193,6 +3193,7 @@ CONFIG_REGULATOR_GPIO=y
|
||||
# CONFIG_REGULATOR_TPS65132 is not set
|
||||
# CONFIG_REGULATOR_TPS6524X is not set
|
||||
# CONFIG_REGULATOR_VCTRL is not set
|
||||
CONFIG_CEC_CORE=y
|
||||
CONFIG_RC_CORE=y
|
||||
CONFIG_RC_MAP=m
|
||||
CONFIG_LIRC=y
|
||||
@ -3239,6 +3240,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
|
||||
CONFIG_MEDIA_RADIO_SUPPORT=y
|
||||
# CONFIG_MEDIA_SDR_SUPPORT is not set
|
||||
# CONFIG_MEDIA_CEC_SUPPORT is not set
|
||||
# CONFIG_MEDIA_CEC_RC is not set
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
CONFIG_MEDIA_CONTROLLER_DVB=y
|
||||
CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
|
||||
@ -3809,7 +3811,7 @@ CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
CONFIG_DRM_FBDEV_OVERALLOC=100
|
||||
# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
|
||||
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
|
||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||
# CONFIG_DRM_DP_CEC is not set
|
||||
CONFIG_DRM_GEM_CMA_HELPER=y
|
||||
CONFIG_DRM_KMS_CMA_HELPER=y
|
||||
@ -3931,7 +3933,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
|
||||
# CONFIG_DRM_STI is not set
|
||||
CONFIG_DRM_V3D=y
|
||||
CONFIG_DRM_VC4=y
|
||||
# CONFIG_DRM_VC4_HDMI_CEC is not set
|
||||
CONFIG_DRM_VC4_HDMI_CEC=y
|
||||
# CONFIG_DRM_ETNAVIV is not set
|
||||
# CONFIG_DRM_ARCPGU is not set
|
||||
# CONFIG_DRM_MXSFB is not set
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user