3 files changed, 9 insertions, 0 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 08c6c62f93..97e315880e 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -490,6 +490,7 @@
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
+  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
   #
   # Semi-hosting filesystem
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index e1571e0a18..9462c8d0a1 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -162,6 +162,7 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
+  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
   #
   # Semi-hosting filesystem
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
index 4e8c02d3fc..171b0420d5 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
@@ -106,6 +106,10 @@
 //#define PL111_CLCD_BASE                       PL111_CLCD_MOTHERBOARD_BASE
 #define PL111_CLCD_BASE                         PL111_CLCD_CORE_TILE_BASE
 
+// Specify which Watchdog to use
+#define SP805_WDOG_BASE                         SP805_WDOG_MOTHERBOARD_BASE
+//#define SP805_WDOG_BASE                       SP805_WDOG_CORE_TILE_BASE
+
 /***********************************************************************************
    Peripherals' misc settings
 ************************************************************************************/
@@ -129,6 +133,9 @@
 // PL031 RTC - Other settings
 #define PL031_PPM_ACCURACY                      300000000
 
+// SP805 Watchdog - Other settings
+#define SP805_CLOCK_FREQUENCY                   32000
+#define SP805_MAX_TICKS                         0xFFFFFFFF
 
 // PL111 Lcd
 #define PL111_CLCD_CORE_TILE_VIDEO_MODE_OSC_ID  1