Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vesta
u-boot-2015.04
Commits
313e8aac
Commit
313e8aac
authored
15 years ago
by
Mike Frysinger
Browse files
Options
Downloads
Patches
Plain Diff
Blackfin: move watchdog config check to Makefile
Signed-off-by:
Mike Frysinger
<
vapier@gentoo.org
>
parent
dc6bc645
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cpu/blackfin/Makefile
+1
-1
1 addition, 1 deletion
cpu/blackfin/Makefile
cpu/blackfin/watchdog.c
+1
-3
1 addition, 3 deletions
cpu/blackfin/watchdog.c
with
2 additions
and
4 deletions
cpu/blackfin/Makefile
+
1
−
1
View file @
313e8aac
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
cpu/blackfin/watchdog.c
+
1
−
3
View file @
313e8aac
/*
* watchdog.c - driver for Blackfin on-chip watchdog
*
* Copyright (c) 2007-200
8
Analog Devices Inc.
* Copyright (c) 2007-200
9
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment