Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / include / configs / display5.h

diff --git a/include/configs/display5.h b/include/configs/display5.h
index de11ff61c66121514c3115da33975f9599f916fb..d80641568eb44c8294cbc7713762c984b9305574 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -341,12 +341,12 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Watchdog */
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
 #if defined(CONFIG_SPL_BUILD)
 #undef CONFIG_WDT
 #undef CONFIG_WATCHDOG
 #define CONFIG_HW_WATCHDOG
 #endif
+
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                (SZ_64K)