Skip to content

Commit

Permalink
ARM: bcm: Add missing sentinel to bcm2711_compat[]
Browse files Browse the repository at this point in the history
commit 781fa0a ("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: 781fa0a ("ARM: bcm: Add support for BCM2711 SoC")
Acked-by: Stefan Wahren <wahrenst@gmx.net>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  • Loading branch information
H. Nikolaus Schaller authored and Florian Fainelli committed Dec 16, 2019
1 parent e42617b commit 59034b9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-bcm/bcm2711.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ static const char * const bcm2711_compat[] = {
#ifdef CONFIG_ARCH_MULTI_V7
"brcm,bcm2711",
#endif
NULL
};

DT_MACHINE_START(BCM2711, "BCM2711")
Expand Down

0 comments on commit 59034b9

Please sign in to comment.