Merge pull request #661 from hexluthor/watchdog-enable

CC2538: Add WATCHDOG_CONF_ENABLE to optionally disable the watchdog timer

cpu/cc2538/dev/watchdog.c

@@ -87,6 +87,7 @@ void
 watchdog_reboot(void)
 {
   INTERRUPTS_DISABLE();
+  watchdog_start(); /* just in case the WDT hasn't been started yet */
   while(1);
 }
 /**

platform/cc2538dk/contiki-conf.h

@@ -73,6 +73,16 @@ typedef uint32_t rtimer_clock_t;
 #endif
 /** @} */
 /*---------------------------------------------------------------------------*/
+/**
+ * \name Watchdog Timer configuration
+ *
+ * @{
+ */
+#ifndef WATCHDOG_CONF_ENABLE
+#define WATCHDOG_CONF_ENABLE	1 /**<Enable the watchdog timer */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
 /**
  * \name USB 'core' configuration
  *

platform/cc2538dk/contiki-main.c

@@ -203,7 +203,9 @@ main(void)
 
   autostart_start(autostart_processes);
 
+#if WATCHDOG_CONF_ENABLE
   watchdog_start();
+#endif
   fade(LEDS_ORANGE);
 
   while(1) {