diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-09 01:45:49 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-09 01:45:49 +0300 |
| commit | 8c05abad1367e33908ee43c590801e338967838d (patch) | |
| tree | 6644cea40665b66d386b16935ee82c8ecf420d84 /scripts | |
| parent | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (diff) | |
| parent | ca51ef7c0c6140e6590746b07dad19040f95ef60 (diff) | |
| download | u-boot-8c05abad1367e33908ee43c590801e338967838d.tar.xz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb855354ae..a1bf63c1f4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4339,7 +4339,6 @@ CONFIG_WATCHDOG_NOWAYOUT CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT -CONFIG_WATCHDOG_TIMEOUT_MSECS CONFIG_WD_PERIOD CONFIG_X600 CONFIG_X86EMU_DEBUG |