diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:49 -0400 |
| commit | 8c05abad1367e33908ee43c590801e338967838d (patch) | |
| tree | 6644cea40665b66d386b16935ee82c8ecf420d84 /arch | |
| parent | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (diff) | |
| parent | ca51ef7c0c6140e6590746b07dad19040f95ef60 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 index 9583bf743e..d7f7b9f111 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 @@ -16,6 +16,5 @@ You can enable it by setting CONFIG_IMX_WATCHDOG. Use following config to set watchdog timeout, if this config is not defined, the default timeout value is 128s which is the maximum. Set 10 seconds for example: - #define CONFIG_WATCHDOG_TIMEOUT_MSECS 10000 Set CONFIG_WATCHDOG_RESET_DISABLE to disable reset watchdog, so that the watchdog will not be fed in u-boot. |