arm: fix armv7 breakage due to BCM2711 support
This commit is contained in:
Peter Robinson
parent
c3d2e0b2c2
commit
79730560f8
@ -0,0 +1,156 @@
|
||||
From patchwork Sat Dec 14 22:04:27 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: "H. Nikolaus Schaller" <hns@goldelico.com>
|
||||
X-Patchwork-Id: 11292523
|
||||
Return-Path:
|
||||
<SRS0=w3rS=2E=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||
[172.30.200.123])
|
||||
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6AEB14B7
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Sat, 14 Dec 2019 22:04:51 +0000 (UTC)
|
||||
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||
[198.137.202.133])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by mail.kernel.org (Postfix) with ESMTPS id A847E214AF
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Sat, 14 Dec 2019 22:04:51 +0000 (UTC)
|
||||
Authentication-Results: mail.kernel.org;
|
||||
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||
header.i=@lists.infradead.org header.b="DLIqrvMe";
|
||||
dkim=fail reason="signature verification failed" (2048-bit key)
|
||||
header.d=goldelico.com header.i=@goldelico.com header.b="Ll3r485+"
|
||||
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A847E214AF
|
||||
Authentication-Results: mail.kernel.org;
|
||||
dmarc=none (p=none dis=none) header.from=goldelico.com
|
||||
Authentication-Results: mail.kernel.org;
|
||||
spf=none
|
||||
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||
Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
|
||||
List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To
|
||||
:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
|
||||
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
|
||||
List-Owner; bh=lOHOud9UbtIa18U9P4miiR8GPmJTWy+IvL7VTp0JEpg=; b=DLIqrvMeyl5Skq
|
||||
j51vEj+M7N78kVXRF9v5Jsjz3NfbAS9LMnXP3RYBXhk/6nWuDRa0br6Kgi5qPQywbG/Qbj0QUpJLJ
|
||||
akybI8WOGUGVXPPNjFVl9BapN+iw8Urp1Y7Nfd0tbEs1kM1jcRLfjbLf/x3JCrLfaapnp3Oh0I+s+
|
||||
kbjd3NwtUVO6TZdLcfO77sqPJ+UqMvPKzjVmjxHHLyQzjvTHUdB4pislcydn+2gAFcDQKeDaq8G8o
|
||||
X4mhEWVH9E8RIMEVksIpCcFAeelKUp48QqX7RaAMwMPkzqrDYbmibpYBYvNrxOMTtdFS6ENPP3bT4
|
||||
gZUWuHkV7YE8wEh6t5tg==;
|
||||
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
||||
id 1igFWr-0003rI-Ek; Sat, 14 Dec 2019 22:04:49 +0000
|
||||
Received: from mo6-p01-ob.smtp.rzone.de ([2a01:238:20a:202:5301::5])
|
||||
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
||||
id 1igFWn-0003pa-BN; Sat, 14 Dec 2019 22:04:47 +0000
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1576361082;
|
||||
s=strato-dkim-0002; d=goldelico.com;
|
||||
h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From:
|
||||
Subject:Sender;
|
||||
bh=LpDKj822zUyMoXRXIUjh14hwRFU++ehi8QyZ3hnuTeM=;
|
||||
b=Ll3r485+sd4TyJkATj8aAHoS+QXqh1bzsS3ezYdVztaKlEE0wkzeTaiwjR1/Xa5Ef0
|
||||
oj2PFklfWDY/OlFjlDFXQmvY6YKkVDbyqVTeJB91bXjaajD1daWpha2ce4BaLXOx3K3+
|
||||
PRB3NedXbJC98wLFeqjzl2ty1WAGOy42qUStP9rTTGJjsGkoZeM4Qlg7aqkPu34R2+pw
|
||||
8MsM0A9Katu3umJiHZGONiH20gTt53QMdiAbRZbUkGaNaqLiMovViti0FD6o+H1S6YbV
|
||||
WP+T/goIbqqM9ozjEEhfoYt1gP/lxfPVg+ELiEfM5IEkdAtOzELXfo9z1IqyOcx2qxlK
|
||||
MXlA==
|
||||
X-RZG-AUTH: ":JGIXVUS7cutRB/49FwqZ7WcJeFKiMhflhwDubTJ9o1OAA2UNf2AyOEF/Q6ay"
|
||||
X-RZG-CLASS-ID: mo00
|
||||
Received: from iMac.fritz.box by smtp.strato.de (RZmta 46.0.7 DYNA|AUTH)
|
||||
with ESMTPSA id i03ca8vBEM4SCNB
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits))
|
||||
(Client did not present a certificate);
|
||||
Sat, 14 Dec 2019 23:04:28 +0100 (CET)
|
||||
From: "H. Nikolaus Schaller" <hns@goldelico.com>
|
||||
To: Stefan Wahren <wahrenst@gmx.net>, Florian Fainelli <f.fainelli@gmail.com>,
|
||||
Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Subject: [PATCH v2] ARM: bcm: Fix support for BCM2711 SoC which breaks other
|
||||
ARM platforms
|
||||
Date: Sat, 14 Dec 2019 23:04:27 +0100
|
||||
Message-Id:
|
||||
<0d7bef0622d69bd4f1129afe26b358669e639ae8.1576361067.git.hns@goldelico.com>
|
||||
X-Mailer: git-send-email 2.23.0
|
||||
MIME-Version: 1.0
|
||||
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||
X-CRM114-CacheID: sfid-20191214_140445_984312_4D674F56
|
||||
X-CRM114-Status: GOOD ( 10.58 )
|
||||
X-Spam-Score: -0.9 (/)
|
||||
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||
Content analysis details: (-0.9 points)
|
||||
pts rule name description
|
||||
---- ----------------------
|
||||
--------------------------------------------------
|
||||
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
|
||||
low trust [2a01:238:20a:202:5301:0:0:5 listed in]
|
||||
[list.dnswl.org]
|
||||
0.0 SPF_NONE SPF: sender does not publish an SPF Record
|
||||
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
|
||||
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||
envelope-from domain
|
||||
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||
not necessarily
|
||||
valid
|
||||
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||
author's domain
|
||||
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||
X-Mailman-Version: 2.1.29
|
||||
Precedence: list
|
||||
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||
List-Unsubscribe:
|
||||
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||
List-Subscribe:
|
||||
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||
Cc: letux-kernel@openphoenux.org, Tony Lindgren <tony@atomide.com>,
|
||||
"H. Nikolaus Schaller" <hns@goldelico.com>, linux@armlinux.org.uk,
|
||||
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
|
||||
linux-rpi-kernel@lists.infradead.org, kernel@pyra-handheld.com,
|
||||
Linux-OMAP <linux-omap@vger.kernel.org>,
|
||||
arm-soc <linux-arm-kernel@lists.infradead.org>
|
||||
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||
Errors-To:
|
||||
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||
|
||||
commit 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")
|
||||
|
||||
breaks boot of many other platforms (e.g. OMAP or i.MX6) if
|
||||
CONFIG_ARCH_BCM2835 is enabled in addition to some multiplatform
|
||||
config (e.g. omap2plus_defconfig). The symptom is that the OMAP
|
||||
based board does not show any activity beyond "Starting Kernel ..."
|
||||
even with earlycon.
|
||||
|
||||
Reverting the mentioned commit makes it work again.
|
||||
|
||||
The real fix is to add the missing NULL sentinel to the
|
||||
bcm2711_compat[] variable-length array.
|
||||
|
||||
Fixes: 781fa0a95424 ("ARM: bcm: Add support for BCM2711 SoC")
|
||||
Acked-by: Stefan Wahren <wahrenst@gmx.net>
|
||||
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
|
||||
---
|
||||
arch/arm/mach-bcm/bcm2711.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/arm/mach-bcm/bcm2711.c b/arch/arm/mach-bcm/bcm2711.c
|
||||
index dbe296798647..fa0300d8c79d 100644
|
||||
--- a/arch/arm/mach-bcm/bcm2711.c
|
||||
+++ b/arch/arm/mach-bcm/bcm2711.c
|
||||
@@ -13,6 +13,7 @@ static const char * const bcm2711_compat[] = {
|
||||
#ifdef CONFIG_ARCH_MULTI_V7
|
||||
"brcm,bcm2711",
|
||||
#endif
|
||||
+ NULL
|
||||
};
|
||||
|
||||
DT_MACHINE_START(BCM2711, "BCM2711")
|
||||
@ -820,6 +820,8 @@ Patch304: ARM-tegra-usb-no-reset.patch
|
||||
Patch310: Raspberry-Pi-4-PCIe-support.patch
|
||||
# https://patchwork.kernel.org/patch/11223139/
|
||||
Patch311: ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch
|
||||
# https://patchwork.kernel.org/patch/11292523/
|
||||
Patch312: ARM-bcm-Fix-support-for-BCM2711-SoC-which-breaks-other-ARM-platforms.patch
|
||||
|
||||
# Tegra bits
|
||||
Patch320: arm64-tegra-jetson-tx1-fixes.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user