aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-03-05 14:39:42 +0000
committerTom Rini <trini@ti.com>2013-03-15 16:13:59 -0400
commita6741bce507151f561250a00f28bcbfb2372ba02 (patch)
tree83d8928a740cb387d5157880c3195890eee05931
parent5c1a7ea6adf80decf6a9e998afc6a26508c68dbc (diff)
downloadu-boot-midas-a6741bce507151f561250a00f28bcbfb2372ba02.tar.gz
u-boot-midas-a6741bce507151f561250a00f28bcbfb2372ba02.tar.bz2
u-boot-midas-a6741bce507151f561250a00f28bcbfb2372ba02.zip
Declare watchdog functions in watchdog.h
These functions are only available for powerpc and are not declared in a header file. We want to use the rest function in two places (board_f and board_r), so declare the functions in watchdog.h. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/m68k/lib/board.c1
-rw-r--r--arch/powerpc/lib/board.c11
-rw-r--r--arch/sh/lib/board.c1
-rw-r--r--include/watchdog.h18
4 files changed, 22 insertions, 9 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index b676255dd0..adaccfe69e 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -80,6 +80,7 @@ extern ulong __init_end;
extern ulong __bss_end;
#if defined(CONFIG_WATCHDOG)
+# undef INIT_FUNC_WATCHDOG_INIT
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 0b23d30b8d..acb6fdbf64 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -237,25 +237,18 @@ static int init_func_spi(void)
/***********************************************************************/
#if defined(CONFIG_WATCHDOG)
-static int init_func_watchdog_init(void)
+int init_func_watchdog_init(void)
{
puts(" Watchdog enabled\n");
WATCHDOG_RESET();
return 0;
}
-#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
-
-static int init_func_watchdog_reset(void)
+int init_func_watchdog_reset(void)
{
WATCHDOG_RESET();
return 0;
}
-
-#define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset,
-#else
-#define INIT_FUNC_WATCHDOG_INIT /* undef */
-#define INIT_FUNC_WATCHDOG_RESET /* undef */
#endif /* CONFIG_WATCHDOG */
/*
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 34d7881f44..6e43acfbd3 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -65,6 +65,7 @@ static int sh_flash_init(void)
#if defined(CONFIG_WATCHDOG)
extern int watchdog_init(void);
extern int watchdog_disable(void);
+# undef INIT_FUNC_WATCHDOG_INIT
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
#else
diff --git a/include/watchdog.h b/include/watchdog.h
index 8c92a0b31b..97ec186be3 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -27,6 +27,24 @@
#ifndef _WATCHDOG_H_
#define _WATCHDOG_H_
+#if !defined(__ASSEMBLY__)
+/*
+ * Reset the watchdog timer, always returns 0
+ *
+ * This function is here since it is shared between board_f() and board_r(),
+ * and the legacy arch/<arch>/board.c code.
+ */
+int init_func_watchdog_reset(void);
+#endif
+
+#ifdef CONFIG_WATCHDOG
+#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
+#define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset,
+#else
+#define INIT_FUNC_WATCHDOG_INIT
+#define INIT_FUNC_WATCHDOG_RESET
+#endif
+
#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG)
# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
#endif