From patchwork Sun Dec 15 07:49:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H. Nikolaus Schaller" X-Patchwork-Id: 11292717 Return-Path: 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 F222A139A for ; Sun, 15 Dec 2019 07:49:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE753205C9 for ; Sun, 15 Dec 2019 07:49:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=goldelico.com header.i=@goldelico.com header.b="iLO1ZWXB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726111AbfLOHtY (ORCPT ); Sun, 15 Dec 2019 02:49:24 -0500 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.80]:27640 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726049AbfLOHtY (ORCPT ); Sun, 15 Dec 2019 02:49:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1576396162; 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=iLO1ZWXBJ+7uX7gEI7zFf0aBf3+FrmdAggJ4tFbf2ZO+A4vgKzzQTtZHjrvZSPNJHb cTOKuWydC7bqNtnYllIwzH4+pN2iRoYM6d5ichTNlK412Ig7Dhv015uikmiHVnGxlvgJ gbaw5PxuFaZ+bGVPmcmHDSDG3306jhYqE6oD5GlQbGJe0etP2AM59daU0Ap2bNIwoXZ5 NHmlJ3HDIjfj7KwGVsFVyXC5t4o4kbVqeY4vhcN6oiekJ/eH42ytzIbvwbdQbYpnMPBb Zd1tElSHJ/07uE4BVp/12vbTOEwv8xCdc58eGriByIDkhBGVwhhhn6HRVOnetphKEXA/ Utaw== X-RZG-AUTH: ":JGIXVUS7cutRB/49FwqZ7WcJeFKiMhflhwDubTJ9o1OAA2UNf2M7Nk1c1UM=" X-RZG-CLASS-ID: mo00 Received: from iMac.fritz.box by smtp.strato.de (RZmta 46.0.7 DYNA|AUTH) with ESMTPSA id i03ca8vBF7n2D4c (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sun, 15 Dec 2019 08:49:02 +0100 (CET) From: "H. Nikolaus Schaller" To: Stefan Wahren , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne Cc: linux@armlinux.org.uk, Linux Kernel Mailing List , linux-rpi-kernel@lists.infradead.org, arm-soc , Linux-OMAP , Tony Lindgren , letux-kernel@openphoenux.org, kernel@pyra-handheld.com, "H. Nikolaus Schaller" Subject: [PATCH v3] ARM: bcm: Add missing sentinel to bcm2711_compat[] Date: Sun, 15 Dec 2019 08:49:02 +0100 Message-Id: X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 Signed-off-by: H. Nikolaus Schaller --- 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")