0fff900184
If CONFIG_SMP=n, building a kernel for R-Car Gen2 fails with:
arch/arm/mach-shmobile/setup-rcar-gen2.o: In function `rcar_gen2_timer_init':
setup-rcar-gen2.c:(.init.text+0x30): undefined reference to `secure_cntvoff_init'
Indeed, on R-Car Gen2 SoCs, secure_cntvoff_init() is not only needed for
secondary CPUs, but also for the boot CPU. This is most visible on SoCs
with Cortex A7 cores (e.g. R-Car E2, cfr. commit 9ce3fa6816 ("ARM:
shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794")),
but Cortex A15 is affected, too.
Fix this by always providing secure_cntvoff_init() when building for ARM
V7.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 7c607944bc ("ARM: smp: Add initialization of CNTVOFF")
Fixes: cad160ed0a ("ARM: shmobile: Convert file to use cntvoff")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Olof Johansson <olof@lixom.net>
21 lines
659 B
Makefile
21 lines
659 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
obj-y += firmware.o
|
|
|
|
obj-$(CONFIG_SA1111) += sa1111.o
|
|
obj-$(CONFIG_DMABOUNCE) += dmabounce.o
|
|
obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
|
|
obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
|
|
obj-$(CONFIG_SHARP_SCOOP) += scoop.o
|
|
obj-$(CONFIG_CPU_V7) += secure_cntvoff.o
|
|
obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
|
|
obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
|
|
CFLAGS_REMOVE_mcpm_entry.o = -pg
|
|
AFLAGS_mcpm_head.o := -march=armv7-a
|
|
AFLAGS_vlock.o := -march=armv7-a
|
|
obj-$(CONFIG_BL_SWITCHER) += bL_switcher.o
|
|
obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o
|