microblaze: Fix watchdog initialization
The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
(sha1: e9a389a184)
changed hw_watchdog_init() prototype which didn't match
with Microblaze one.
This patch fixes the driver and Microblaze initialization.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
@@ -16,7 +16,6 @@ extern char __text_start[];
|
||||
void board_init(void);
|
||||
|
||||
/* Watchdog functions */
|
||||
extern int hw_watchdog_init(void);
|
||||
extern void hw_watchdog_disable(void);
|
||||
|
||||
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */
|
||||
|
||||
@@ -46,9 +46,6 @@ init_fnc_t *init_sequence[] = {
|
||||
serial_init,
|
||||
console_init_f,
|
||||
interrupts_init,
|
||||
#ifdef CONFIG_XILINX_TB_WATCHDOG
|
||||
hw_watchdog_init,
|
||||
#endif
|
||||
timer_init,
|
||||
NULL,
|
||||
};
|
||||
@@ -97,6 +94,9 @@ void board_init_f(ulong not_used)
|
||||
|
||||
serial_initialize();
|
||||
|
||||
#ifdef CONFIG_XILINX_TB_WATCHDOG
|
||||
hw_watchdog_init();
|
||||
#endif
|
||||
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
|
||||
WATCHDOG_RESET();
|
||||
if ((*init_fnc_ptr) () != 0)
|
||||
|
||||
Reference in New Issue
Block a user