From: Simon Glass <sjg@chromium.org>
Date: Sun, 30 Aug 2015 22:55:18 +0000 (-0600)
Subject: arm: reset: Avoid a build error when the reset uclass is enabled
X-Git-Tag: v2015.10-rc3~6^2~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c6aabe9289e4f3a3b9066cd494c413302dfa970a;p=u-boot

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 31a5c8d77f..15e74bd484 100644
--- 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