projects
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc7b2f4
)
arm: reset: Avoid a build error when the reset uclass is enabled
author
Simon Glass
<sjg@chromium.org>
Sun, 30 Aug 2015 22:55:18 +0000
(16:55 -0600)
committer
Simon Glass
<sjg@chromium.org>
Thu, 3 Sep 2015 03:28:23 +0000
(21:28 -0600)
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>
arch/arm/lib/Makefile
patch
|
blob
|
history
diff --git
a/arch/arm/lib/Makefile
b/arch/arm/lib/Makefile
index
31a5c8d
..
15e74bd
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