From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 10 Apr 2013 23:23:40 +0200
Subject: [U-Boot] [PATCH] mx31pdk: Remove watchdog support
In-Reply-To: <1365534232-6393-1-git-send-email-fabio.estevam@freescale.com>
References: <1365534232-6393-1-git-send-email-fabio.estevam@freescale.com>
Message-ID: <20130410232340.6b23ae81@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Fabio,

On Tue, 9 Apr 2013 16:03:52 -0300, Fabio Estevam
<fabio.estevam@freescale.com> wrote:

> 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>
> ---
>  include/configs/mx31pdk.h |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
> index 34e4295..da894c4 100644
> --- a/include/configs/mx31pdk.h
> +++ b/include/configs/mx31pdk.h
> @@ -60,8 +60,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

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.