unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / hal / arm / mx27 / var / v2_0 / include / hal_var_ints.h

diff --git a/packages/hal/arm/mx27/var/v2_0/include/hal_var_ints.h b/packages/hal/arm/mx27/var/v2_0/include/hal_var_ints.h
index 6fbc48e592e05fa78d826fa6ca3c5a039e6c3d59..c8191d3a7dd21e363881577f17d8272a49da0877 100644 (file)
--- a/packages/hal/arm/mx27/var/v2_0/include/hal_var_ints.h
+++ b/packages/hal/arm/mx27/var/v2_0/include/hal_var_ints.h
@@ -114,12 +114,13 @@ externC void hal_clock_latency(cyg_uint32 *);
 
 //----------------------------------------------------------------------------
 // Reset.
-#define HAL_PLATFORM_RESET()                                               \
-    CYG_MACRO_START                                                        \
-        *(volatile unsigned long *)SOC_CRM_PCCR1 |= 0x01000000;  \
-        *(volatile unsigned short *)SOC_WDOG_BASE |= 0x4;  \
-        /* hang here forever if reset fails */               \
-        while (1){}                                          \
+#define HAL_PLATFORM_RESET()                                                           \
+    CYG_MACRO_START                                                                    \
+        *(volatile unsigned long *)SOC_CRM_PCCR1 |= 0x01000000;                                \
+        *(volatile unsigned short *)SOC_WDOG_BASE =                                    \
+               (*(volatile unsigned short *)SOC_WDOG_BASE & ~(1 << 4)) | (1 << 2);     \
+        /* hang here forever if reset fails */                                         \
+        while (1) { }                                                                  \
     CYG_MACRO_END
 
 // Fallback (never really used)