From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 20 Apr 2017 21:12:14 +0200 Subject: [U-Boot] [PATCH v4 03/14] MIPS: allow using generic sysreset drivers In-Reply-To: <1492715545-3010-1-git-send-email-noltari@gmail.com> References: <1492715545-3010-1-git-send-email-noltari@gmail.com> Message-ID: <1492715545-3010-4-git-send-email-noltari@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de Avoid duplicating do_reset definition if SYSRESET is enabled for MIPS Signed-off-by: Álvaro Fernández Rojas Reviewed-by: Simon Glass --- v4: No changes. v3: No changes. v2: No changes. arch/mips/cpu/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c index 1b919ed..55e6498 100644 --- a/arch/mips/cpu/cpu.c +++ b/arch/mips/cpu/cpu.c @@ -12,6 +12,7 @@ #include #include +#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) { -- 2.1.4