projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e388969
)
MIPS: allow using generic sysreset drivers
author
Álvaro Fernández Rojas
<noltari@gmail.com>
Mon, 24 Apr 2017 22:39:15 +0000
(
00:39
+0200)
committer
Daniel Schwierzeck
<daniel.schwierzeck@gmail.com>
Wed, 10 May 2017 14:16:09 +0000
(16:16 +0200)
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>
arch/mips/cpu/cpu.c
patch
|
blob
|
history
diff --git
a/arch/mips/cpu/cpu.c
b/arch/mips/cpu/cpu.c
index 1b919ed82289d1d4d30e4daccf057c8c4e89e9ed..55e6498b6557c75b265328b3eb3958ded4d5d758 100644
(file)
--- 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)
{