commit 10a8b94f6a127ed6b38bd8ae2d424d031d546f72
author Fabio Estevam <fabio.estevam@freescale.com> Tue Apr 09 09:03:52 2013 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Fri Apr 12 08:47:42 2013 +0200
tree e105efc3af4de5f374225ccb56eacc1c3937d6b5
parent 3954db8717b496a1d15bfa4c2807208b819e202f

mx31pdk: Remove watchdog support

The conversion of mx31pdk to SPL NAND fixed the boot issue, but we start seeing
resets in loop, which prevents us from reaching the U-boot prompt.

Until the proper fix can be identified, disable watchdog, so that mx31pdk
can be functional again.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>

include/configs/mx31pdk.h

diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 80ec08e..1754595 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -69,8 +69,6 @@
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_MXC_GPIO
 
 #define CONFIG_HARD_SPI