Watchdog is reloaded by HOOK_TICK, not its own task

This reduces memory footprint.

BUG=chrome-os-partner:15714
BRANCH=none
TEST=system still boots; 'waitms 1500' prints watchdog error dump

Change-Id: Ieb0248a34655514b03d919cc36c2b369691da716
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36937
Reviewed-by: Simon Glass <sjg@chromium.org>

34 files changed, 42 insertions, 52 deletions

diff --git a/board/bds/ec.tasklist b/board/bds/ec.tasklist
index 2b619f192b..b6ceedcfd5 100644
--- a/board/bds/ec.tasklist
+++ b/board/bds/ec.tasklist
@@ -16,6 +16,5 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
 	TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/board/daisy/ec.tasklist b/board/daisy/ec.tasklist
index 25c4675852..1097aeb4e1 100644
--- a/board/daisy/ec.tasklist
+++ b/board/daisy/ec.tasklist
@@ -16,7 +16,6 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERLED, power_led_task, NULL, TASK_STACK_SIZE) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist
index 72d55d010f..eda9a9ea85 100644
--- a/board/link/ec.tasklist
+++ b/board/link/ec.tasklist
@@ -16,7 +16,6 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, WATCHDOG_TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK(LIGHTBAR, lightbar_task, NULL, TASK_STACK_SIZE) \
 	TASK(CHARGER, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
diff --git a/board/snow/ec.tasklist b/board/snow/ec.tasklist
index 811fa9238a..a07dfca87e 100644
--- a/board/snow/ec.tasklist
+++ b/board/snow/ec.tasklist
@@ -16,7 +16,6 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, 256) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERLED, power_led_task, NULL, 256) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
diff --git a/board/spring/ec.tasklist b/board/spring/ec.tasklist
index 474a5160d3..c29cca16df 100644
--- a/board/spring/ec.tasklist
+++ b/board/spring/ec.tasklist
@@ -16,7 +16,6 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
-	TASK(WATCHDOG, watchdog_task, NULL, 256) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PMU_TPS65090_CHARGER, pmu_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK(KEYSCAN, keyboard_scan_task, NULL, 256) \
diff --git a/chip/lm4/build.mk b/chip/lm4/build.mk
index d627409afb..c1405aeeb4 100644
--- a/chip/lm4/build.mk
+++ b/chip/lm4/build.mk
@@ -10,7 +10,7 @@
 CORE:=cortex-m
 
 # Required chip modules
-chip-y=clock.o gpio.o hwtimer.o jtag.o system.o uart.o watchdog.o
+chip-y=clock.o gpio.o hwtimer.o jtag.o system.o uart.o
 
 # Optional chip modules
 chip-$(CONFIG_ADC)+=adc.o
@@ -25,3 +25,4 @@ chip-$(CONFIG_TASK_PWM)+=pwm.o
 chip-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o keyboard_scan_stub.o
 chip-$(CONFIG_TASK_SWITCH)+=switch.o
 chip-$(CONFIG_TASK_TEMPSENSOR)+=chip_temp_sensor.o
+chip-$(CONFIG_WATCHDOG)+=watchdog.o
diff --git a/chip/lm4/config.h b/chip/lm4/config.h
index aa40382b42..b82c74eae7 100644
--- a/chip/lm4/config.h
+++ b/chip/lm4/config.h
@@ -29,7 +29,6 @@
 
 /* non-standard task stack sizes */
 #define IDLE_TASK_STACK_SIZE        384
-#define WATCHDOG_TASK_STACK_SIZE    256
 #define LARGER_TASK_STACK_SIZE      640
 
 /* Default task stack size */
@@ -89,6 +88,7 @@
 #define CONFIG_FLASH
 #define CONFIG_FPU
 #define CONFIG_I2C
+#define CONFIG_WATCHDOG
 
 /* Compile for running from RAM instead of flash */
 /* #define COMPILE_FOR_RAM */
diff --git a/chip/lm4/flash.c b/chip/lm4/flash.c
index e599fa5a96..51d9a46577 100644
--- a/chip/lm4/flash.c
+++ b/chip/lm4/flash.c
@@ -171,7 +171,7 @@ static int write_buffer(void)
 	/* Start write operation at page boundary */
 	LM4_FLASH_FMC2 = 0xa4420001;
 
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 	/* Reload the watchdog timer, so that writing a large amount of flash
 	 * doesn't cause a watchdog reset. */
 	watchdog_reload();
@@ -240,7 +240,7 @@ int flash_physical_erase(int offset, int size)
 
 		LM4_FLASH_FMA = offset;
 
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 		/* Reload the watchdog timer, so that erasing many flash pages
 		 * doesn't cause a watchdog reset.  May not need this now that
 		 * we're using msleep() below. */
diff --git a/chip/lm4/watchdog.c b/chip/lm4/watchdog.c
index 58cabf80f9..7bc7aa8a60 100644
--- a/chip/lm4/watchdog.c
+++ b/chip/lm4/watchdog.c
@@ -5,10 +5,8 @@
 
 /* Watchdog driver */
 
-#include "board.h"
 #include "clock.h"
 #include "common.h"
-#include "config.h"
 #include "registers.h"
 #include "gpio.h"
 #include "hooks.h"
@@ -79,6 +77,7 @@ void watchdog_reload(void)
 	/* Re-lock watchdog registers */
 	LM4_WATCHDOG_LOCK(0) = 0xdeaddead;
 }
+DECLARE_HOOK(HOOK_TICK, watchdog_reload, HOOK_PRIO_DEFAULT);
 
 static void watchdog_freq_changed(void)
 {
diff --git a/chip/stm32/build.mk b/chip/stm32/build.mk
index b58953e995..36496ba411 100644
--- a/chip/stm32/build.mk
+++ b/chip/stm32/build.mk
@@ -13,7 +13,7 @@ chip-y=dma.o gpio.o hwtimer.o system.o uart.o
 chip-y+=jtag-$(CHIP_VARIANT).o clock-$(CHIP_VARIANT).o gpio-$(CHIP_VARIANT).o
 chip-$(CONFIG_SPI)+=spi.o
 chip-$(CONFIG_I2C)+=i2c.o
-chip-$(CONFIG_TASK_WATCHDOG)+=watchdog.o
+chip-$(CONFIG_WATCHDOG)+=watchdog.o
 chip-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o
 chip-$(CONFIG_TASK_POWERLED)+=power_led.o
 chip-$(CONFIG_FLASH)+=flash-$(CHIP_VARIANT).o
diff --git a/chip/stm32/config.h b/chip/stm32/config.h
index bc7283396a..5a1ab1e449 100644
--- a/chip/stm32/config.h
+++ b/chip/stm32/config.h
@@ -33,6 +33,9 @@
 /* build with assertions and debug messages */
 #define CONFIG_DEBUG
 
+/* Enable watchdog timer */
+#define CONFIG_WATCHDOG
+
 /* Compile for running from RAM instead of flash */
 /* #define COMPILE_FOR_RAM */
 
diff --git a/chip/stm32/flash-stm32f100.c b/chip/stm32/flash-stm32f100.c
index 907b246e84..7932a85df4 100644
--- a/chip/stm32/flash-stm32f100.c
+++ b/chip/stm32/flash-stm32f100.c
@@ -314,7 +314,7 @@ int flash_physical_write(int offset, int size, const char *data)
 	STM32_FLASH_CR |= PG;
 
 	for ( ; size > 0; size -= sizeof(uint16_t)) {
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 		/* Reload the watchdog timer to avoid watchdog reset when doing
 		 * long writing with interrupt disabled.
 		 */
@@ -383,7 +383,7 @@ int flash_physical_erase(int offset, int size)
 		/* set STRT bit : start erase */
 		STM32_FLASH_CR |= STRT;
 
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 		/*
 		 * Reload the watchdog timer to avoid watchdog reset during a
 		 * long erase operation.
diff --git a/chip/stm32/flash-stm32l15x.c b/chip/stm32/flash-stm32l15x.c
index cbe7953797..046c106820 100644
--- a/chip/stm32/flash-stm32l15x.c
+++ b/chip/stm32/flash-stm32l15x.c
@@ -189,7 +189,7 @@ int flash_physical_write(int offset, int size, const char *data)
 
 	for (address = (uint32_t *)(CONFIG_FLASH_BASE + offset) ;
 	     size > 0; size -= CONFIG_FLASH_WRITE_SIZE) {
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 		/*
 		 * Reload the watchdog timer to avoid watchdog reset when doing
 		 * long writing with interrupt disabled.
@@ -249,7 +249,7 @@ int flash_physical_erase(int offset, int size)
 		/* Start erase */
 		*address = 0x00000000;
 
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 		/*
 		 * Reload the watchdog timer to avoid watchdog reset during
 		 * multi-page erase operations.
diff --git a/chip/stm32/watchdog.c b/chip/stm32/watchdog.c
index d93d0a6b96..774768ad36 100644
--- a/chip/stm32/watchdog.c
+++ b/chip/stm32/watchdog.c
@@ -5,12 +5,11 @@
 
 /* Watchdog driver */
 
-#include "board.h"
 #include "common.h"
-#include "config.h"
-#include "registers.h"
 #include "gpio.h"
+#include "hooks.h"
 #include "hwtimer.h"
+#include "registers.h"
 #include "task.h"
 #include "timer.h"
 #include "util.h"
@@ -56,6 +55,7 @@ void watchdog_reload(void)
 	hwtimer_reset_watchdog();
 #endif
 }
+DECLARE_HOOK(HOOK_TICK, watchdog_reload, HOOK_PRIO_DEFAULT);
 
 int watchdog_init(void)
 {
diff --git a/common/main.c b/common/main.c
index 103cb42d19..0830cc6879 100644
--- a/common/main.c
+++ b/common/main.c
@@ -95,7 +95,7 @@ int main(void)
 	CPRINTF("[Image: %s, %s]\n",
 		 system_get_image_copy_string(), system_get_build_info());
 
-#ifdef CONFIG_TASK_WATCHDOG
+#ifdef CONFIG_WATCHDOG
 	/*
 	 * Intialize watchdog timer.  All lengthy operations between now and
 	 * task_start() must periodically call watchdog_reload() to avoid
diff --git a/core/cortex-m/build.mk b/core/cortex-m/build.mk
index 35ad2d0517..ec1ba424a8 100644
--- a/core/cortex-m/build.mk
+++ b/core/cortex-m/build.mk
@@ -14,4 +14,4 @@ CFLAGS_CPU=-mcpu=cortex-m4 -mthumb -Os -mno-sched-prolog
 CFLAGS_CPU+=$(CFLAGS_FPU-y)
 
 core-y=cpu.o init.o panic.o switch.o task.o timer.o
-core-$(CONFIG_TASK_WATCHDOG)+=watchdog.o
+core-$(CONFIG_WATCHDOG)+=watchdog.o
diff --git a/core/cortex-m/watchdog.c b/core/cortex-m/watchdog.c
index fe8ba776bf..ff876912d1 100644
--- a/core/cortex-m/watchdog.c
+++ b/core/cortex-m/watchdog.c
@@ -39,12 +39,3 @@ void watchdog_trace(uint32_t excep_lr, uint32_t excep_sp)
 	timer_print_info();
 	task_print_list();
 }
-
-/* Low priority task to reload the watchdog */
-void watchdog_task(void)
-{
-	while (1) {
-		msleep(WATCHDOG_RELOAD_MS);
-		watchdog_reload();
-	}
-}
diff --git a/include/watchdog.h b/include/watchdog.h
index 46f3b996d7..ca88094e6a 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -8,16 +8,15 @@
 #ifndef __CROS_EC_WATCHDOG_H
 #define __CROS_EC_WATCHDOG_H
 
-#define WATCHDOG_PERIOD_MS 1100  /* Watchdog period in ms */
+/* Watchdog period in ms; must be at least twice HOOK_TICK_INTERVAL */
+#define WATCHDOG_PERIOD_MS 1100
 
-/*
- * Interval in ms between reloads of the watchdog timer.  Should be less
- * than half of the watchdog period.
+/**
+ * Initialize the watchdog.
+ *
+ * This will cause the CPU to reboot if it has been more than 2 watchdog
+ * periods since watchdog_reload() has been called.
  */
-#define WATCHDOG_RELOAD_MS 500
-
-/* Initialize the watchdog.  This will cause the CPU to reboot if it has been
- * more than 2 watchdog periods since watchdog_reload() has been called. */
 int watchdog_init(void);
 
 /**
diff --git a/test/charging.tasklist b/test/charging.tasklist
index 1403653779..69af3bc38e 100644
--- a/test/charging.tasklist
+++ b/test/charging.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/flash_overwrite.tasklist b/test/flash_overwrite.tasklist
index df7abf767b..8ed7251437 100644
--- a/test/flash_overwrite.tasklist
+++ b/test/flash_overwrite.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/flash_rw_erase.tasklist b/test/flash_rw_erase.tasklist
index 993b172aad..fc65eeb63a 100644
--- a/test/flash_rw_erase.tasklist
+++ b/test/flash_rw_erase.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/hello.tasklist b/test/hello.tasklist
index 993b172aad..fc65eeb63a 100644
--- a/test/hello.tasklist
+++ b/test/hello.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/kb_debounce.tasklist b/test/kb_debounce.tasklist
index ef03820794..6415d6c2dd 100644
--- a/test/kb_debounce.tasklist
+++ b/test/kb_debounce.tasklist
@@ -14,7 +14,7 @@
  * 'd' in an opaque parameter passed to the routine at startup
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/kb_deghost.tasklist b/test/kb_deghost.tasklist
index 17df5b5b6a..2c531cc4d5 100644
--- a/test/kb_deghost.tasklist
+++ b/test/kb_deghost.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/mutex.tasklist b/test/mutex.tasklist
index 44bfe8b664..e27e9d385a 100644
--- a/test/mutex.tasklist
+++ b/test/mutex.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist
index 91719a0cd3..ca28d23cd5 100644
--- a/test/pingpong.tasklist
+++ b/test/pingpong.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/power_button.tasklist b/test/power_button.tasklist
index 3ecc53e638..b5144b72e2 100644
--- a/test/power_button.tasklist
+++ b/test/power_button.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist
index 27978e0b22..74ad0db736 100644
--- a/test/powerdemo.tasklist
+++ b/test/powerdemo.tasklist
@@ -15,5 +15,6 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
 	TASK(POWERDEMO, power_demo_task, NULL, TASK_STACK_SIZE)
diff --git a/test/scancode.tasklist b/test/scancode.tasklist
index 250bbbc721..9ddf62aa95 100644
--- a/test/scancode.tasklist
+++ b/test/scancode.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/thermal.tasklist b/test/thermal.tasklist
index 4037f3c773..e099a0fa7b 100644
--- a/test/thermal.tasklist
+++ b/test/thermal.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(TEMPSENSOR, temp_sensor_task, NULL, TASK_STACK_SIZE) \
 	TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist
index 31302767c2..00b31fb899 100644
--- a/test/timer_calib.tasklist
+++ b/test/timer_calib.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(TESTTMR, timer_calib_task, (void *)'T', TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist
index 0ee84ced4f..82378ce6ec 100644
--- a/test/timer_dos.tasklist
+++ b/test/timer_dos.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
   TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
   TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
   TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/timer_jump.tasklist b/test/timer_jump.tasklist
index 163bf93887..ccb6fe7a4c 100644
--- a/test/timer_jump.tasklist
+++ b/test/timer_jump.tasklist
@@ -15,6 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
diff --git a/test/typematic.tasklist b/test/typematic.tasklist
index 17df5b5b6a..2c531cc4d5 100644
--- a/test/typematic.tasklist
+++ b/test/typematic.tasklist
@@ -15,7 +15,7 @@
  * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(TICK, hook_task, NULL, TASK_STACK_SIZE) \
 	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
 	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
 	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \