karo: tx6: use HW_WATCHDOG instead of IMX_WATCHDOG

This is consistent with all other TX modules.

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 86b15250c089a81a5cfd7ffe2a00d3dbb9e72822..0a9182dcc32f150673f540e5455c6faee6abecf4 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -48,8 +48,8 @@ struct scu_regs {
 void hw_watchdog_reset(void)
 {
        if (readw(wdog_base + WDOG_WCR) & WCR_WDE) {
-               static u16 toggle = 0xaaaa;
-               static int first = 1;
+               static u16 __data toggle = 0xaaaa;
+               static int __data first = 1;
 
                if (first) {
                        printf("Watchdog active\n");

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index adf859eec2c9caf829283175df75703b2ba9e353..6cc28b3c89ab992d6b03c9f8f0796b2c2508a8d9 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -134,8 +134,7 @@
 #define CONFIG_FDTADDR                 10001000
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
-#define CONFIG_IMX_WATCHDOG
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS  3000
+#define CONFIG_HW_WATCHDOG
 #ifndef CONFIG_SYS_LVDS_IF
 #define DEFAULT_VIDEO_MODE             "VGA"
 #else