diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-07 08:45:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-07 08:45:43 -0500 |
| commit | d8a3f5259a36e76d1de127f65714c40918e8ee4c (patch) | |
| tree | 6a4ca1942f084a11465ad990433306c2dfdc7b55 /include/configs/dh_imx6.h | |
| parent | ac0f978afd4b8d388b0b194bc6e5982efc383a59 (diff) | |
| parent | b6e7ef4bf71bc0927dea35fdec0a653a82ae57a7 (diff) | |
Merge tag 'u-boot-imx-20200107' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
New for 2020.04
---------------
- New boards
Embedded Artists COM board
Xea Board
- Switch to DM:
Aristainetos boards
Toradex colibri (DM_ETH)
iCubox
GE bx50v3
mx7dsabre (DM_ETH)
cx9020
- New features:
Bootaux with elf files
Default SYS_THUMB_BUILD for i.MX6/7
- Fixes:
DHCOM i.MX6 PDK
Engicam
i.MX8M tools (imx8m_image)
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/633679664
Diffstat (limited to 'include/configs/dh_imx6.h')
| -rw-r--r-- | include/configs/dh_imx6.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index d762d2cb19..087d020cdd 100644 --- 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 |