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 /include/configs/dh_imx6.h | |
| parent | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (diff) | |
| parent | ca51ef7c0c6140e6590746b07dad19040f95ef60 (diff) | |
| download | u-boot-8c05abad1367e33908ee43c590801e338967838d.tar.gz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvellWIP/08Oct2019
- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
Diffstat (limited to 'include/configs/dh_imx6.h')
| -rw-r--r-- | include/configs/dh_imx6.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index c516e6ed4c..a854d0b531 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -88,7 +88,6 @@ #endif /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE |