From: Christian Lamparter Date: Fri, 4 Mar 2011 19:49:57 +0000 (+0100) Subject: carl9170 firmware: always enable HW watchdog X-Git-Tag: 1.9.3~3 X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=75bc8a0282106f10e82c3bccd29fe1f18344d034;hp=592643728e9b7c37c918afee05df8142c6d7303e carl9170 firmware: always enable HW watchdog Ultimately, this is a mandatory feature and must be activated. Signed-off-by: Christian Lamparter --- diff --git a/carlfw/Kconfig b/carlfw/Kconfig index 1c5718a..fd1161e 100644 --- a/carlfw/Kconfig +++ b/carlfw/Kconfig @@ -31,15 +31,6 @@ config CARL9170FW_RX_FRAME_LEN default 16384 if CARL9170FW_RX_FRAME_LEN_16384 default 32768 if CARL9170FW_RX_FRAME_LEN_32768 -config CARL9170FW_WATCHDOG - def_bool y - prompt "Activate HW Watchdog" - ---help--- - The watchdog will notify the application as soon as the firmware - has stalled. - - Say Y. - config CARL9170FW_GPIO_INTERRUPT def_bool y prompt "GPIO Software Interrupt" @@ -208,7 +199,7 @@ config CARL9170FW_DEBUG_UART config CARL9170FW_WATCHDOG_BUTTON def_bool n - depends on CARL9170FW_BROKEN && CARL9170FW_WATCHDOG && CARL9170FW_GPIO_INTERRUPT + depends on CARL9170FW_BROKEN && CARL9170FW_GPIO_INTERRUPT prompt "Trigger Watchdog by pressing the WPS button" choice CARL9170FW_UART_CLOCK diff --git a/carlfw/src/main.c b/carlfw/src/main.c index b11f048..0653ae4 100644 --- a/carlfw/src/main.c +++ b/carlfw/src/main.c @@ -71,14 +71,9 @@ static void init(void) orl(AR9170_MAC_REG_AFTER_PNP, 1); /* Init watch dog control flag */ -#ifdef CONFIG_CARL9170FW_WATCHDOG fw.watchdog_enable = 1; set(AR9170_TIMER_REG_WATCH_DOG, AR9170_WATCH_DOG_TIMER); -#else - fw.watchdog_enable = 0; - set(AR9170_TIMER_REG_WATCH_DOG, 0xffff); -#endif /* CONFIG_CARL9170FW_WATCHDOG */ #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT fw.cached_gpio_state.gpio = get(AR9170_GPIO_REG_PORT_DATA) &