summaryrefslogtreecommitdiff
path: root/arch/powerpc/lib
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 /arch/powerpc/lib
parent5c1a7ea6adf80decf6a9e998afc6a26508c68dbc (diff)
downloadu-boot-imx-a6741bce507151f561250a00f28bcbfb2372ba02.zip
u-boot-imx-a6741bce507151f561250a00f28bcbfb2372ba02.tar.gz
u-boot-imx-a6741bce507151f561250a00f28bcbfb2372ba02.tar.bz2
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>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/board.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 0b23d30..acb6fdb 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 */
/*