diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-11-12 18:42:07 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 09:17:26 -0500 |
| commit | 313e8aacc1c9f5ca06085fa19b1429fa18a01aaa (patch) | |
| tree | 6f783397792bf884293787a0d56b7d0c7d33e376 | |
| parent | dc6bc645e0cc1939b31cc54346415cf8e0dffc88 (diff) | |
| download | u-boot-imx-313e8aacc1c9f5ca06085fa19b1429fa18a01aaa.zip u-boot-imx-313e8aacc1c9f5ca06085fa19b1429fa18a01aaa.tar.gz u-boot-imx-313e8aacc1c9f5ca06085fa19b1429fa18a01aaa.tar.bz2 | |
Blackfin: move watchdog config check to Makefile
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | cpu/blackfin/Makefile | 2 | ||||
| -rw-r--r-- | cpu/blackfin/watchdog.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cpu/blackfin/Makefile b/cpu/blackfin/Makefile index 5eef6a3..211b8d5 100644 --- a/cpu/blackfin/Makefile +++ b/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 diff --git a/cpu/blackfin/watchdog.c b/cpu/blackfin/watchdog.c index b47c6b6..1886bda 100644 --- a/cpu/blackfin/watchdog.c +++ b/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 |