diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-10 15:50:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-10 15:50:21 -0400 |
| commit | 102d86552abc82818c22b39fdef4b3a280a60643 (patch) | |
| tree | 781ad3640c611f036fbd4645aa1623bfc5ba9a0c /arch/mips/cpu/cpu.c | |
| parent | 05b8dc5cd30a6d6cdfb29c9e718198692e12b4bf (diff) | |
| parent | a41481bfcba89d1d8dd8b51faa7775cd3ff1c15f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/cpu/cpu.c')
| -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) { |