mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
59034b9d6a
commit781fa0a954("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:781fa0a954("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>
26 lines
439 B
C
26 lines
439 B
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2019 Stefan Wahren
|
|
*/
|
|
|
|
#include <linux/of_address.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "platsmp.h"
|
|
|
|
static const char * const bcm2711_compat[] = {
|
|
#ifdef CONFIG_ARCH_MULTI_V7
|
|
"brcm,bcm2711",
|
|
#endif
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(BCM2711, "BCM2711")
|
|
#ifdef CONFIG_ZONE_DMA
|
|
.dma_zone_size = SZ_1G,
|
|
#endif
|
|
.dt_compat = bcm2711_compat,
|
|
.smp = smp_ops(bcm2836_smp_ops),
|
|
MACHINE_END
|