From patchwork Fri Apr 2 16:23:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jochen Friedrich X-Patchwork-Id: 71735 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id B0AF7104D2AE for ; Fri, 2 Apr 2010 18:37:37 +0200 (CEST) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 98338C913116 for ; Fri, 2 Apr 2010 18:37:37 +0200 (CEST) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.9) for (single-drop); Fri, 02 Apr 2010 18:37:37 +0200 (CEST) Received: from murder (svr19.m-online.net [192.168.3.147]) by backend2 (Cyrus v2.2.12) with LMTPA; Fri, 02 Apr 2010 18:35:00 +0200 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend3.pop.m-online.net (Cyrus v2.2.13) with LMTPA; Fri, 02 Apr 2010 18:35:00 +0200 Received: from scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) by mail.m-online.net (Postfix) with ESMTP id EBCC620012B; Fri, 2 Apr 2010 18:34:59 +0200 (CEST) Received: from mxin-3.m-online.net ([192.168.6.165]) by scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) (amavisd-new, port 10026) with ESMTP id 03209-06; Fri, 2 Apr 2010 18:34:59 +0200 (CEST) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-3.m-online.net (Postfix) with ESMTP id 9B57E47A4F5; Fri, 2 Apr 2010 18:34:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2BDCD281E1; Fri, 2 Apr 2010 18:34:51 +0200 (CEST) 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 xGJQIjYLQdBg; Fri, 2 Apr 2010 18:34:50 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8DEE2281E2; Fri, 2 Apr 2010 18:34:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2CE09281DD for ; Fri, 2 Apr 2010 18:34:44 +0200 (CEST) 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 f9rgvPalZXHT for ; Fri, 2 Apr 2010 18:34:42 +0200 (CEST) X-Greylist: delayed 637 seconds by postgrey-1.27 at theia; Fri, 02 Apr 2010 18:34:40 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 mail.colab.de (mail.colab.de [195.226.127.114]) by theia.denx.de (Postfix) with ESMTP id 07096281D4 for ; Fri, 2 Apr 2010 18:34:40 +0200 (CEST) Received: from localhost (amavis.colab.de [88.198.23.89]) by localhost (Postfix) with ESMTP id 76E536E53E; Fri, 2 Apr 2010 16:24:02 +0000 (UTC) Received: from mail.colab.de ([195.226.127.114]) by localhost (amavis.colab.de [88.198.23.89]) (amavisd-new, port 10024) with ESMTP id sMnlQQRB3HMM; Fri, 2 Apr 2010 18:24:02 +0200 (CEST) Received: from rs6000.colab.de (nat.colab.de [195.226.127.133]) by mail.colab.de (Postfix) with ESMTP id 2658E6E4C8; Fri, 2 Apr 2010 16:24:02 +0000 (UTC) Received: from vrnul03074nb (dev1.internal.bocc.de [192.168.95.11]) by rs6000.colab.de (Postfix) with ESMTP id EBB68448130; Fri, 2 Apr 2010 18:24:01 +0200 (CEST) Received: by vrnul03074nb (Postfix, from userid 1000) id 5635212607C; Fri, 2 Apr 2010 18:24:02 +0200 (CEST) From: Jochen Friedrich To: u-boot@lists.denx.de Date: Fri, 2 Apr 2010 18:23:57 +0200 Message-Id: <1270225437-19168-1-git-send-email-jochen@scram.de> X-Mailer: git-send-email 1.7.0.3 Subject: [U-Boot] [PATCH] sa1100 change get_timer(base) to return time since base X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Virus-Scanned: by amavisd-new at m-online.net similar to 274737e5eb25b2bcd3af3a96da923effd543284f This patch changes get_timer() for sa1100 to return the time since 'base' instead of the time since the counter was at zero. Symptom seen is flash timeout errors when erasing or programming a sector using the common cfi flash code. Signed-off-by: Jochen Friedrich --- cpu/sa1100/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu/sa1100/timer.c b/cpu/sa1100/timer.c index 0207501..aea90ab 100644 --- a/cpu/sa1100/timer.c +++ b/cpu/sa1100/timer.c @@ -41,7 +41,7 @@ void reset_timer (void) ulong get_timer (ulong base) { - return get_timer_masked (); + return get_timer_masked () - base; } void set_timer (ulong t)