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-20200107' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[oweals/u-boot.git]
/
include
/
configs
/
dh_imx6.h
diff --git
a/include/configs/dh_imx6.h
b/include/configs/dh_imx6.h
index d762d2cb19b5b7a4f44d2f9f67808e3914b544a8..087d020cdd378fba032612b0ad02faadd4c85e5a 100644
(file)
--- a/
include/configs/dh_imx6.h
+++ b/
include/configs/dh_imx6.h
@@
-87,6
+87,11
@@
#endif
/* Watchdog */
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_WDT
+#undef CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG
+#endif
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE