diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-30 16:55:18 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-09-02 21:28:23 -0600 |
| commit | c6aabe9289e4f3a3b9066cd494c413302dfa970a (patch) | |
| tree | 81f64cd0d7c9a87f7dcceac6e10a63512de1d90a /arch/arm/lib | |
| parent | bc7b2f431d5e5b48c009007bdf22d2f2d8aed4c4 (diff) | |
| download | blackbird-obmc-uboot-c6aabe9289e4f3a3b9066cd494c413302dfa970a.tar.gz blackbird-obmc-uboot-c6aabe9289e4f3a3b9066cd494c413302dfa970a.zip | |
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>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
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 |
