projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[oweals/u-boot.git]
/
configs
/
display5_defconfig
diff --git
a/configs/display5_defconfig
b/configs/display5_defconfig
index 46bcdaffc835a3d9d8d9bb376285a652bcbbc1b9..3227249413e43b490db8cb512370c563c33d5f6f 100644
(file)
--- a/
configs/display5_defconfig
+++ b/
configs/display5_defconfig
@@
-108,6
+108,7
@@
CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_MXC_UART=y
CONFIG_SPI=y
CONFIG_MXC_SPI=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
CONFIG_SYSRESET=y
CONFIG_SYSRESET_WATCHDOG=y
CONFIG_I2C_EDID=y