Pārlūkot izejas kodu

Blackfin: move watchdog config check to Makefile

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger 15 gadi atpakaļ
vecāks
revīzija
313e8aacc1
2 mainītis faili ar 2 papildinājumiem un 4 dzēšanām
  1. 1 1
      cpu/blackfin/Makefile
  2. 1 3
      cpu/blackfin/watchdog.c

+ 1 - 1
cpu/blackfin/Makefile

@@ -24,7 +24,7 @@ COBJS-y  += os_log.o
 COBJS-y  += reset.o
 COBJS-y  += serial.o
 COBJS-y  += traps.o
-COBJS-y  += watchdog.o
+COBJS-$(CONFIG_HW_WATCHDOG)  += watchdog.o
 
 ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
 COBJS-y  += initcode.o

+ 1 - 3
cpu/blackfin/watchdog.c

@@ -1,7 +1,7 @@
 /*
  * 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.
  */
@@ -10,7 +10,6 @@
 #include <watchdog.h>
 #include <asm/blackfin.h>
 
-#ifdef CONFIG_HW_WATCHDOG
 void hw_watchdog_reset(void)
 {
 	bfin_write_WDOG_STAT(0);
@@ -22,4 +21,3 @@ void hw_watchdog_init(void)
 	hw_watchdog_reset();
 	bfin_write_WDOG_CTL(0x0);
 }
-#endif