On 12/14/2019 2:04 PM, H. Nikolaus Schaller wrote:
> 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@xxxxxxx>
> Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
This looks fine, I would just rephrase the commit subject as:
ARM: bcm: Add missing sentinel to bcm2711_compat[]
instead of indicating the breakage but not so much the fix, if that is
okay with you. And good catch, I will augment my local tests with a
basic multiplatform boot on several QEMU supported platforms.
> ---
> 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")
>
--
Florian
