projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complete test.
[bertos.git]
/
bertos
/
cpu
/
arm
/
hw
/
init_at91.c
diff --git
a/bertos/cpu/arm/hw/init_at91.c
b/bertos/cpu/arm/hw/init_at91.c
index fc7ffaf47ed265935de926ce8ec61d98e89ccf3a..f803c5954fed2786e11e28fa297c0546b2b1aec2 100644
(file)
--- a/
bertos/cpu/arm/hw/init_at91.c
+++ b/
bertos/cpu/arm/hw/init_at91.c
@@
-39,6
+39,8
@@
#include <io/arm.h>
#include <cfg/macros.h>
#include <io/arm.h>
#include <cfg/macros.h>
+#include "cfg/cfg_wdt.h"
+
#define USE_FIXED_PLL 1
#define XTAL_FREQ 18432000UL
#define USE_FIXED_PLL 1
#define XTAL_FREQ 18432000UL
@@
-171,8
+173,10
@@
void __init1(void)
AIC_EOICR = 0xFFFFFFFF;
AIC_IDCR = 0xFFFFFFFF;
AIC_EOICR = 0xFFFFFFFF;
AIC_IDCR = 0xFFFFFFFF;
- /* The watchdog is enabled after processor reset. Disable it. */
- WDT_MR = BV(WDT_WDDIS);
+ #if CONFIG_WATCHDOG == 0
+ /* The watchdog is enabled after processor reset. Disable it. */
+ WDT_MR = BV(WDT_WDDIS);
+ #endif
/*
* Enable the main oscillator. Set startup time of 6 * 8 slow
/*
* Enable the main oscillator. Set startup time of 6 * 8 slow