diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 00:21:24 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 00:21:24 +0200 |
| commit | b653516769160a7ba5bb4318c014535e063fdc0b (patch) | |
| tree | c690067308fbb118a069b84276f19880f7f83b47 /arch/arm/lib | |
| parent | 681f785f7cc616a70aaa0c93a25300b0820f6968 (diff) | |
| parent | 5cecf21fb1fadeb39be862793f743841ad373601 (diff) | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/reset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 7a0358071c..9a95f08504 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -23,6 +23,10 @@ #include <common.h> +__weak void reset_misc(void) +{ +} + int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { puts ("resetting ...\n"); @@ -30,6 +34,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) udelay (50000); /* wait 50 ms */ disable_interrupts(); + + reset_misc(); reset_cpu(0); /*NOTREACHED*/ |