X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fhw%2Finit_at91.c;h=f803c5954fed2786e11e28fa297c0546b2b1aec2;hb=b30ca67e54f665181d85a49bff3af2862e86601e;hp=fc7ffaf47ed265935de926ce8ec61d98e89ccf3a;hpb=8c634de12fc219460e899e8977651e3781a7e104;p=bertos.git

diff --git a/bertos/cpu/arm/hw/init_at91.c b/bertos/cpu/arm/hw/init_at91.c
index fc7ffaf4..f803c595 100644
--- 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 "cfg/cfg_wdt.h"
+
 #define USE_FIXED_PLL 1
 
 #define XTAL_FREQ 18432000UL
@@ -171,8 +173,10 @@ void __init1(void)
 	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