arm: reset: Avoid a build error when the reset uclass is enabled

There can be only one do_reset(). When CONFIG_RESET is enabled this is
provided by the reset uclass, and ARM's version should be disabled.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 31a5c8d77f52ad844ed4fc53becaead8c181261f..15e74bd484e8e3b97172ac79c11a40f4f66802fe 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -47,7 +47,9 @@ obj-y += interrupts_64.o
 else
 obj-y  += interrupts.o
 endif
+ifndef CONFIG_RESET
 obj-y  += reset.o
+endif
 
 obj-y  += cache.o
 ifndef CONFIG_ARM64