瀏覽代碼

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>
Simon Glass 9 年之前
父節點
當前提交
c6aabe9289
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      arch/arm/lib/Makefile

+ 2 - 0
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