diff options
| author | Clément Léger <clement.leger@bootlin.com> | 2021-08-04 16:55:44 +0200 |
|---|---|---|
| committer | Eugen Hristev <eugen.hristev@microchip.com> | 2021-09-21 10:05:37 +0300 |
| commit | 094f19c5274b758a243158f69367626049f283e5 (patch) | |
| tree | 84569872e8c283bdf2e4959004ae84240a7d5e2c | |
| parent | b8ccd77193788596c23196d6fe40831f12f2e0f1 (diff) | |
| download | u-boot-094f19c5274b758a243158f69367626049f283e5.zip u-boot-094f19c5274b758a243158f69367626049f283e5.tar.gz u-boot-094f19c5274b758a243158f69367626049f283e5.tar.bz2 | |
ARM: mach-at91: armv7: fix multiple cpu_reset definition when enabling SYSRESET
When SYSRESET is enabled, cpu_reset function is also defined in
sysreset-uclass.c which lead to multiple definitions of this function
since reset.c is build unconditionally. Add a check in Makefile to build
this file only if SYSRESET isn't enabled.
SYSRESET can be enabled when building SYSRESET_PSCI for instance on this
platform.
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
| -rw-r--r-- | arch/arm/mach-at91/armv7/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile index f5b2665..246050b 100644 --- a/arch/arm/mach-at91/armv7/Makefile +++ b/arch/arm/mach-at91/armv7/Makefile @@ -11,7 +11,9 @@ obj-$(CONFIG_SAMA5D3) += sama5d3_devices.o clock.o obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o clock.o obj-$(CONFIG_SAMA7G5) += sama7g5_devices.o obj-y += cpu.o -obj-y += reset.o +ifndef CONFIG_$(SPL_TPL_)SYSRESET +obj-y += reset.o +endif ifneq ($(CONFIG_ATMEL_PIT_TIMER),y) ifneq ($(CONFIG_MCHP_PIT64B_TIMER),y) # old non-DM timer driver |