Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 8 Oct 2019 22:45:49 +0000 (18:45 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 8 Oct 2019 22:45:49 +0000 (18:45 -0400)
commit8c05abad1367e33908ee43c590801e338967838d
tree6644cea40665b66d386b16935ee82c8ecf420d84
parentefea5a34bb5be542630ce7161bd3b9cc26a0bcf3
parentca51ef7c0c6140e6590746b07dad19040f95ef60
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
scripts/config_whitelist.txt