diff options
| author | Sergei Poselenov <sposelenov@emcraft.com> | 2007-07-05 08:17:37 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-07-05 08:17:37 +0200 |
| commit | b44896215a09c60fa40cae906f7ed207bbc2c492 (patch) | |
| tree | f3c10a507342d083a17dbd7f98e5c662a8f2432e /post/cpu/ppc4xx/watchdog.c | |
| parent | f780b83316d9af1f61d71cc88b1917b387b9b995 (diff) | |
| download | u-boot-imx-b44896215a09c60fa40cae906f7ed207bbc2c492.zip u-boot-imx-b44896215a09c60fa40cae906f7ed207bbc2c492.tar.gz u-boot-imx-b44896215a09c60fa40cae906f7ed207bbc2c492.tar.bz2 | |
Merged POST framework with the current TOT.
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Diffstat (limited to 'post/cpu/ppc4xx/watchdog.c')
| -rw-r--r-- | post/cpu/ppc4xx/watchdog.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/post/cpu/ppc4xx/watchdog.c b/post/cpu/ppc4xx/watchdog.c index 3c76cfd..bd4f4c9 100644 --- a/post/cpu/ppc4xx/watchdog.c +++ b/post/cpu/ppc4xx/watchdog.c @@ -2,6 +2,8 @@ * (C) Copyright 2007 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * + * Author: Igor Lisitsin <igor@emcraft.com> + * * See file CREDITS for list of people who contributed to this * project. * @@ -36,17 +38,18 @@ #ifdef CONFIG_POST #include <post.h> -#include <watchdog.h> #if CONFIG_POST & CFG_POST_WATCHDOG +#include <watchdog.h> + int watchdog_post_test (int flags) { if (flags & POST_REBOOT) { /* Test passed */ - return 0; - } else { + } + else { /* 10-second delay */ int ints = disable_interrupts (); ulong base = post_time_ms (0); |