Merge tag 'ti-v2020.07-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti...

[oweals/u-boot.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 2b8064dfae0688761b58b5909d139778404fa031..d24c1e48353f420f71b87b35d352ab8715413000 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -2,6 +2,7 @@ menu "Watchdog Timer Support"
 
 config WATCHDOG
        bool "Enable U-Boot watchdog reset"
+       depends on !HW_WATCHDOG
        help
          This option enables U-Boot watchdog support where U-Boot is using
          watchdog_reset function to service watchdog device in U-Boot. Enable
@@ -45,6 +46,13 @@ config ULP_WATCHDOG
        help
          Say Y here to enable i.MX7ULP watchdog driver.
 
+config DESIGNWARE_WATCHDOG
+       bool "Designware watchdog timer support"
+       select HW_WATCHDOG if !WDT
+       help
+          Enable this to support Designware Watchdog Timer IP, present e.g.
+          on Altera SoCFPGA SoCs.
+
 config WDT
        bool "Enable driver model for watchdog timer drivers"
        depends on DM
@@ -100,10 +108,18 @@ config WDT_CDNS
           Select this to enable Cadence watchdog timer, which can be found on some
           Xilinx Microzed Platform.
 
+config WDT_CORTINA
+       bool "Cortina Access CAxxxx watchdog timer support"
+       depends on WDT
+       help
+         Cortina Access CAxxxx watchdog timer support.
+         This driver support all CPU ISAs supported by Cortina
+          Access CAxxxx SoCs.
+
 config WDT_MPC8xx
        bool "MPC8xx watchdog timer support"
        depends on WDT && MPC8xx
-       select CONFIG_MPC8xx_WATCHDOG
+       select HW_WATCHDOG
        help
           Select this to enable mpc8xx watchdog timer