diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-26 20:50:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-26 20:50:00 +0300 |
| commit | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (patch) | |
| tree | f9b57804a3f3c57efcb5a17c836396b3b04dbf5f /drivers/watchdog/Kconfig | |
| parent | 1c64692df20c1f491ea79de3a732428611bb0ba0 (diff) | |
| parent | b684d4031b38b6b6a9e22676c7c6e2770e767cc7 (diff) | |
| download | u-boot-07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f.tar.xz | |
Merge git://git.denx.de/u-boot-marvell
- Add DM based generic watchdog start and reset implementation
and remove all ad-hoc implementations (Stefan)
- Move mv_sdhci to DM (Pierre)
- Misc turris_omnia updates (Pierre)
- Change openrd targets to correctly build again (size changes
and fixes to the dts targets) and bring it back into Travis
builds (Stefan)
- Add Kirkwood db-88f6281-bp board (Chris)
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9d7f503b69..3bce0aa0b8 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -51,6 +51,7 @@ config ULP_WATCHDOG config WDT bool "Enable driver model for watchdog timer drivers" depends on DM + imply WATCHDOG help Enable driver model for watchdog timer. At the moment the API is very simple and only supports four operations: @@ -150,7 +151,6 @@ config WDT_MT7621 config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx - select CONFIG_MPC8xx_WATCHDOG help Select this to enable mpc8xx watchdog timer |