diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2017-04-25 00:39:15 +0200 |
|---|---|---|
| committer | Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | 2017-05-10 16:16:09 +0200 |
| commit | 5e36546c53abe9712193ed303edbfd47c660d121 (patch) | |
| tree | deb3a3dc68f9f45f6f8fd28e824d8442306e9280 | |
| parent | e388969178a471fed636f127faa49b141bd18aab (diff) | |
| download | u-boot-5e36546c53abe9712193ed303edbfd47c660d121.tar.gz | |
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>
| -rw-r--r-- | arch/mips/cpu/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |