From 102b1b7b8398cb80f38a9fa7378e96af077e1899 Mon Sep 17 00:00:00 2001
From: Anish Nair <Anish.Nair@arm.com>
Date: Fri, 10 Jul 2026 10:58:05 +0000
Subject: [PATCH] fix(baremetal): Initialize WD info when runing TIMER module

    Certain timer tests like B_TIME_05 refer to watchdog info

Change-Id: Icc307239c540a44f434d57e9f41b2d53964d649c
---
 apps/baremetal/bsa_main.c    | 2 ++
 apps/baremetal/pc_bsa_main.c | 2 ++
 apps/baremetal/sbsa_main.c   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/apps/baremetal/bsa_main.c b/apps/baremetal/bsa_main.c
index 8fc128a6..5fcca66a 100644
--- a/apps/baremetal/bsa_main.c
+++ b/apps/baremetal/bsa_main.c
@@ -42,6 +42,7 @@ freeAcsMeM(void)
         acs_is_module_enabled(POWER_WAKEUP))
             val_timer_free_info_table();
     if (acs_is_module_enabled(WATCHDOG)     ||
+        acs_is_module_enabled(TIMER)        ||
         acs_is_module_enabled(POWER_WAKEUP))
             val_wd_free_info_table();
     if (acs_is_module_enabled(PCIE)         ||
@@ -204,6 +205,7 @@ ShellAppMainbsa()
             createTimerInfoTable();
 
     if (acs_is_module_enabled(WATCHDOG)    ||
+        acs_is_module_enabled(TIMER)       ||
         acs_is_module_enabled(POWER_WAKEUP))
             createWatchdogInfoTable();
 
diff --git a/apps/baremetal/pc_bsa_main.c b/apps/baremetal/pc_bsa_main.c
index c02cef15..dc0905e1 100644
--- a/apps/baremetal/pc_bsa_main.c
+++ b/apps/baremetal/pc_bsa_main.c
@@ -44,6 +44,7 @@ freeAcsMem(void)
        val_timer_free_info_table();
 
     if (acs_is_module_enabled(WATCHDOG)    ||
+        acs_is_module_enabled(TIMER)       ||
         acs_is_module_enabled(POWER_WAKEUP))
        val_wd_free_info_table();
 
@@ -218,6 +219,7 @@ ShellAppMainpcbsa(void)
         createTimerInfoTable();
 
     if (acs_is_module_enabled(WATCHDOG)    ||
+        acs_is_module_enabled(TIMER)       ||
         acs_is_module_enabled(POWER_WAKEUP))
         createWatchdogInfoTable();
 
diff --git a/apps/baremetal/sbsa_main.c b/apps/baremetal/sbsa_main.c
index 9a73a961..fa985781 100644
--- a/apps/baremetal/sbsa_main.c
+++ b/apps/baremetal/sbsa_main.c
@@ -51,6 +51,7 @@ freeAcsMeM(void)
        val_timer_free_info_table();
 
     if (acs_is_module_enabled(WATCHDOG)    ||
+        acs_is_module_enabled(TIMER)       ||
         acs_is_module_enabled(POWER_WAKEUP))
        val_wd_free_info_table();
 
@@ -242,6 +243,7 @@ ShellAppMainsbsa()
         createTimerInfoTable();
 
     if (acs_is_module_enabled(WATCHDOG)   ||
+        acs_is_module_enabled(TIMER)      ||
         acs_is_module_enabled(POWER_WAKEUP))
         createWatchdogInfoTable();