From e3eef1834ea6cf0f881d2582c706694fb751f018 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Fri, 9 Jan 2015 11:49:53 +0100 Subject: [PATCH] karo: tx6: use HW_WATCHDOG instead of IMX_WATCHDOG This is consistent with all other TX modules. --- arch/arm/cpu/armv7/mx6/soc.c | 4 ++-- include/configs/tx6.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 86b15250c0..0a9182dcc3 100644 --- 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 adf859eec2..6cc28b3c89 100644 --- 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 -- 2.39.2