diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
| commit | 39ddd10b046fb791f47281ffb2100be01909ad72 (patch) | |
| tree | cec01ecc6502a65cbbbda406dfac23b93c093899 /arch/sh/cpu/sh2 | |
| parent | 55357b7846237d12aa5f07aec657c5dbfaf790ed (diff) | |
| parent | 0a9463e93537a68e7246714f43fb69eca0b7b214 (diff) | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'arch/sh/cpu/sh2')
| -rw-r--r-- | arch/sh/cpu/sh2/watchdog.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/sh/cpu/sh2/watchdog.c b/arch/sh/cpu/sh2/watchdog.c index de0254b446..0257d8d15d 100644 --- a/arch/sh/cpu/sh2/watchdog.c +++ b/arch/sh/cpu/sh2/watchdog.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhoro@renesas.com> - * Copyright (C) 2008 Renesas Solutions Corp. + * Copyright (C) 2008,2010 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> + * Copyright (C) 2008,2010 Renesas Solutions Corp. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,6 +20,7 @@ #include <common.h> #include <asm/processor.h> +#include <asm/system.h> int watchdog_init(void) { @@ -28,6 +29,9 @@ int watchdog_init(void) void reset_cpu(unsigned long ignored) { + /* Address error with SR.BL=1 first. */ + trigger_address_error(); + while (1) ; } |