GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blackfin: move watchdog config check to Makefile

Browse source 
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-11-12 18:42:07 -05:00
parent dc6bc645e0
commit 313e8aacc1
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/blackfin/Makefile
View file

@ -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

4
cpu/blackfin/watchdog.c
View file

@ -1,7 +1,7 @@
/* /*
* 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 @@
#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)
hw_watchdog_reset(); hw_watchdog_reset();
bfin_write_WDOG_CTL(0x0); bfin_write_WDOG_CTL(0x0);
} }
#endif