From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Mon, 24 Apr 2017 22:39:15 +0000 (+0200)
Subject: MIPS: allow using generic sysreset drivers
X-Git-Tag: v2017.07-rc1~357^2~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e36546c53abe9712193ed303edbfd47c660d121;p=oweals%2Fu-boot.git

MIPS: allow using generic sysreset drivers

Avoid duplicating do_reset definition if SYSRESET is enabled for MIPS

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c
index 1b919ed822..55e6498b65 100644
--- a/arch/mips/cpu/cpu.c
+++ b/arch/mips/cpu/cpu.c
@@ -12,6 +12,7 @@
 #include <asm/mipsregs.h>
 #include <asm/reboot.h>
 
+#ifndef CONFIG_SYSRESET
 void __weak _machine_restart(void)
 {
 	fprintf(stderr, "*** reset failed ***\n");
@@ -26,6 +27,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	return 0;
 }
+#endif
 
 void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1)
 {