From patchwork Tue Apr 9 19:03:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 235173 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id ED4742C009F for ; Wed, 10 Apr 2013 05:04:42 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 40A9D4A030; Tue, 9 Apr 2013 21:04:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ENbqfC3s15tf; Tue, 9 Apr 2013 21:04:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 83FD54A019; Tue, 9 Apr 2013 21:04:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A69124A019 for ; Tue, 9 Apr 2013 21:04:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M9Iz2KWJ0LqF for ; Tue, 9 Apr 2013 21:04:15 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from tx2outboundpool.messaging.microsoft.com (tx2ehsobe001.messaging.microsoft.com [65.55.88.11]) by theia.denx.de (Postfix) with ESMTPS id 603374A018 for ; Tue, 9 Apr 2013 21:04:10 +0200 (CEST) Received: from mail102-tx2-R.bigfish.com (10.9.14.245) by TX2EHSOBE014.bigfish.com (10.9.40.34) with Microsoft SMTP Server id 14.1.225.23; Tue, 9 Apr 2013 19:04:07 +0000 Received: from mail102-tx2 (localhost [127.0.0.1]) by mail102-tx2-R.bigfish.com (Postfix) with ESMTP id B6EB84200D3; Tue, 9 Apr 2013 19:04:07 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1fc6h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail102-tx2 (localhost.localdomain [127.0.0.1]) by mail102-tx2 (MessageSwitch) id 1365534246378719_21918; Tue, 9 Apr 2013 19:04:06 +0000 (UTC) Received: from TX2EHSMHS008.bigfish.com (unknown [10.9.14.247]) by mail102-tx2.bigfish.com (Postfix) with ESMTP id 48FCB260139; Tue, 9 Apr 2013 19:04:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS008.bigfish.com (10.9.99.108) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 9 Apr 2013 19:04:06 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 9 Apr 2013 19:04:05 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.90]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r39J3wE0022316; Tue, 9 Apr 2013 12:03:59 -0700 From: Fabio Estevam To: Date: Tue, 9 Apr 2013 16:03:52 -0300 Message-ID: <1365534232-6393-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] mx31pdk: Remove watchdog support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 Acked-by: Stefano Babic --- 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