ARM: bcm: Fix support for BCM2711 SoC which breaks other ARM platforms
diff mbox series

Message ID 33662723d61a80669390abc1e592eb006d8709f1.1576353784.git.hns@goldelico.com
State Mainlined
Commit 59034b9d6af8ccc1de0a265ca90b3aa967bae19f
Headers show
Series
  • ARM: bcm: Fix support for BCM2711 SoC which breaks other ARM platforms
Related show

Commit Message

H. Nikolaus Schaller Dec. 14, 2019, 8:03 p.m. UTC
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.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 arch/arm/mach-bcm/bcm2711.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Stefan Wahren Dec. 14, 2019, 9:09 p.m. UTC | #1
Hi Nikolaus,

Am 14.12.19 um 21:03 schrieb H. Nikolaus Schaller:
> 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.
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>

could you please add a Fixes tag. Apart from that

Acked-by: Stefan Wahren <wahrenst@gmx.net>

Thank you
Stefan

> ---
>  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")

Patch
diff mbox series

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")