diff mbox series

[4/4] arm: mvebu: Espressobin: Enable watchdog support but do not start it

Message ID 20210305213659.31025-4-pali@kernel.org
State Superseded
Delegated to: Stefan Roese
Headers show
Series [1/4] watchdog: Set/unset GD_FLG_WDT_READY flag in wdt_start()/wdt_stop() | expand

Commit Message

Pali Rohár March 5, 2021, 9:36 p.m. UTC
Espressobin had disabled watchdog support (CONFIG_WDT) because older stable
Linux kernel versions (which are used by current stable OpenWRT and Debian
versions) do not have support for Armada 3700 watchdog driver. Therefore
they are not able to periodically kick watchdog so Espressobin enter into
boot loop.

This change enable CONFIG_WDT, CONFIG_WDT_ARMADA_37XX and CONFIG_CMD_WDT
options which add support for U-Boot 'wdt' command. And unset new
CONFIG_WATCHDOG_AUTOSTART option which cause that watchdog is not
automatically started by U-Boot during init phase, like when CONFIG_WDT
option is not set at all.

So with this change, U-Boot on Espressobin would have working 'wdt' command
which can be used from boot scripts (e.g. for enabling watchdog prior new
Linux booting kernel). But default behavior of watchdog status stays
unchanged, U-Boot does not start watchdog on Espressobin during its init
phase.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 configs/mvebu_espressobin-88f3720_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Stefan Roese March 9, 2021, 11:34 a.m. UTC | #1
On 05.03.21 22:36, Pali Rohár wrote:
> Espressobin had disabled watchdog support (CONFIG_WDT) because older stable
> Linux kernel versions (which are used by current stable OpenWRT and Debian
> versions) do not have support for Armada 3700 watchdog driver. Therefore
> they are not able to periodically kick watchdog so Espressobin enter into
> boot loop.
> 
> This change enable CONFIG_WDT, CONFIG_WDT_ARMADA_37XX and CONFIG_CMD_WDT
> options which add support for U-Boot 'wdt' command. And unset new
> CONFIG_WATCHDOG_AUTOSTART option which cause that watchdog is not
> automatically started by U-Boot during init phase, like when CONFIG_WDT
> option is not set at all.
> 
> So with this change, U-Boot on Espressobin would have working 'wdt' command
> which can be used from boot scripts (e.g. for enabling watchdog prior new
> Linux booting kernel). But default behavior of watchdog status stays
> unchanged, U-Boot does not start watchdog on Espressobin during its init
> phase.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   configs/mvebu_espressobin-88f3720_defconfig | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
> index c791f98dfea5..20aa21b06b3d 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -32,6 +32,7 @@ CONFIG_CMD_MMC=y
>   CONFIG_CMD_PCI=y
>   CONFIG_CMD_SPI=y
>   CONFIG_CMD_USB=y
> +CONFIG_CMD_WDT=y
>   CONFIG_CMD_TFTPPUT=y
>   CONFIG_CMD_CACHE=y
>   CONFIG_CMD_TIME=y
> @@ -88,5 +89,8 @@ CONFIG_USB_ETHER_ASIX=y
>   CONFIG_USB_ETHER_MCS7830=y
>   CONFIG_USB_ETHER_RTL8152=y
>   CONFIG_USB_ETHER_SMSC95XX=y
> +# CONFIG_WATCHDOG_AUTOSTART is not set
> +CONFIG_WDT=y
> +CONFIG_WDT_ARMADA_37XX=y
>   CONFIG_SHA1=y
>   CONFIG_SHA256=y
> 


Viele Grüße,
Stefan
diff mbox series

Patch

diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index c791f98dfea5..20aa21b06b3d 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -32,6 +32,7 @@  CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_WDT=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
@@ -88,5 +89,8 @@  CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
+# CONFIG_WATCHDOG_AUTOSTART is not set
+CONFIG_WDT=y
+CONFIG_WDT_ARMADA_37XX=y
 CONFIG_SHA1=y
 CONFIG_SHA256=y