Skip to content
Snippets Groups Projects
Commit 313e8aac authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: move watchdog config check to Makefile

parent dc6bc645
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ COBJS-y += os_log.o ...@@ -24,7 +24,7 @@ COBJS-y += os_log.o
COBJS-y += reset.o COBJS-y += reset.o
COBJS-y += serial.o COBJS-y += serial.o
COBJS-y += traps.o COBJS-y += traps.o
COBJS-y += watchdog.o COBJS-$(CONFIG_HW_WATCHDOG) += watchdog.o
ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
COBJS-y += initcode.o COBJS-y += initcode.o
......
/* /*
* watchdog.c - driver for Blackfin on-chip watchdog * watchdog.c - driver for Blackfin on-chip watchdog
* *
* Copyright (c) 2007-2008 Analog Devices Inc. * Copyright (c) 2007-2009 Analog Devices Inc.
* *
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <watchdog.h> #include <watchdog.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#ifdef CONFIG_HW_WATCHDOG
void hw_watchdog_reset(void) void hw_watchdog_reset(void)
{ {
bfin_write_WDOG_STAT(0); bfin_write_WDOG_STAT(0);
...@@ -22,4 +21,3 @@ void hw_watchdog_init(void) ...@@ -22,4 +21,3 @@ void hw_watchdog_init(void)
hw_watchdog_reset(); hw_watchdog_reset();
bfin_write_WDOG_CTL(0x0); bfin_write_WDOG_CTL(0x0);
} }
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment