[U-Boot] [PATCH v4 08/33] arm: reset: Avoid a build error when the reset uclass is enabled

Simon Glass
2015-08-24T15:12:26Z

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>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

arch/arm/lib/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 31a5c8d..15e74bd 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
--
2.5.0.457.gab17608