From a6741bce507151f561250a00f28bcbfb2372ba02 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 5 Mar 2013 14:39:42 +0000 Subject: 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 --- arch/m68k/lib/board.c | 1 + arch/powerpc/lib/board.c | 11 ++--------- arch/sh/lib/board.c | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'arch') 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 -- cgit v1.2.1