diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 |
| commit | 4b7a6dd89633d60dc4b58476d5ce48247f82a3ca (patch) | |
| tree | d3cfeccec77867d855289809d6a472617d16c0cc /include | |
| parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f (diff) | |
| parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 (diff) | |
| download | talos-obmc-uboot-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.tar.gz talos-obmc-uboot-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.zip | |
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
Conflicts:
common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/global_data.h | 3 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/configs/lwmon5.h | 10 |
3 files changed, 17 insertions, 0 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 9ccf7d6017..202c8441c2 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -155,6 +155,9 @@ typedef struct global_data { #if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5) unsigned long kbd_status; #endif +#if defined(CONFIG_WD_MAX_RATE) + unsigned long long wdt_last; /* trace watch-dog triggering rate */ +#endif void **jt; /* jump table */ } gd_t; diff --git a/include/common.h b/include/common.h index 0ac1f80174..f12e3bd0d6 100644 --- a/include/common.h +++ b/include/common.h @@ -681,4 +681,8 @@ int cpu_reset(int nr); int cpu_release(int nr, int argc, char *argv[]); #endif +#ifdef CONFIG_POST +#define CONFIG_HAS_POST +#endif + #endif /* __COMMON_H_ */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 36adf669d4..cc6f87c613 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -98,6 +98,15 @@ #define CFG_WATCHDOG_MAGIC_MASK 0xFFFF0000 #define CFG_DSPIC_TEST_MASK 0x00000001 +/* Additional registers for watchdog timer post test */ + +#define CFG_DSPIC_TEST_ADDR (CFG_PERIPHERAL_BASE + GPT0_COMP5) +#define CFG_WATCHDOG_TIME_ADDR (CFG_PERIPHERAL_BASE + GPT0_COMP4) +#define CFG_WATCHDOG_FLAGS_ADDR (CFG_PERIPHERAL_BASE + GPT0_COMP5) +#define CFG_WATCHDOG_MAGIC 0x12480000 +#define CFG_WATCHDOG_MAGIC_MASK 0xFFFF0000 +#define CFG_DSPIC_TEST_MASK 0x00000001 + /*----------------------------------------------------------------------- * Serial Port *----------------------------------------------------------------------*/ @@ -452,6 +461,7 @@ #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #define CONFIG_WD_PERIOD 40000 /* in usec */ +#define CONFIG_WD_MAX_RATE 66600 /* in ticks */ /* * For booting Linux, the board info and command line data |
