summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 923a662)
raw | patch | inline | side by side (parent: 923a662)
author | Simon Glass <sjg@chromium.org> | |
Thu, 13 Dec 2012 20:49:03 +0000 (20:49 +0000) | ||
committer | Tom Rini <trini@ti.com> | |
Mon, 4 Feb 2013 14:05:44 +0000 (09:05 -0500) |
Move this field into arch_global_data and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
arch/powerpc/include/asm/global_data.h | patch | blob | history | |
board/lwmon5/lwmon5.c | patch | blob | history |
index 52aece012c014391f042b4293a321b62f8c693e2..b138e6460b9898dee1edcfee8dfb491c8b1e47b7 100644 (file)
#ifdef CONFIG_SYS_FPGA_COUNT
unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
#endif
+#if defined(CONFIG_WD_MAX_RATE)
+ unsigned long long wdt_last; /* trace watch-dog triggering rate */
+#endif
};
/*
#endif
#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 */
char env_buf[32]; /* buffer for getenv() before reloc. */
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c
index ecd9536145a63dfce56308a2a22e8b555ed4deea..29e24fb26fe98769ddf7aa114cf632248bf8feb6 100644 (file)
--- a/board/lwmon5/lwmon5.c
+++ b/board/lwmon5/lwmon5.c
* Don't allow watch-dog triggering more frequently than
* the predefined value CONFIG_WD_MAX_RATE [ticks].
*/
- if (ct >= gd->wdt_last) {
- if ((ct - gd->wdt_last) < CONFIG_WD_MAX_RATE)
+ if (ct >= gd->arch.wdt_last) {
+ if ((ct - gd->arch.wdt_last) < CONFIG_WD_MAX_RATE)
return;
} else {
/* Time base counter had been reset */
- if (((unsigned long long)(-1) - gd->wdt_last + ct) <
+ if (((unsigned long long)(-1) - gd->arch.wdt_last + ct) <
CONFIG_WD_MAX_RATE)
return;
}
- gd->wdt_last = get_ticks();
+ gd->arch.wdt_last = get_ticks();
#endif
/*