From patchwork Mon Nov 29 16:08:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 73441 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 47155B70EE for ; Tue, 30 Nov 2010 03:08:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9DF8C28275; Mon, 29 Nov 2010 17:08:43 +0100 (CET) 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 L5rASn+y6xeq; Mon, 29 Nov 2010 17:08:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 802BB281F1; Mon, 29 Nov 2010 17:08:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2555F281F1 for ; Mon, 29 Nov 2010 17:08:39 +0100 (CET) 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 G3DZLQkuCnba for ; Mon, 29 Nov 2010 17:08:37 +0100 (CET) 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-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTP id 044F0281DF for ; Mon, 29 Nov 2010 17:08:35 +0100 (CET) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 02886186DEDA; Mon, 29 Nov 2010 17:08:34 +0100 (CET) Received: from aspire.frauenaurach.dyndns.org (ppp-88-217-122-27.dynamic.mnet-online.de [88.217.122.27]) by mail.mnet-online.de (Postfix) with ESMTP id BC9721C000EA; Mon, 29 Nov 2010 17:08:34 +0100 (CET) From: Thomas Weber To: u-boot@lists.denx.de Date: Mon, 29 Nov 2010 17:08:32 +0100 Message-Id: <1291046912-15167-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <20101129124847.E1D8111D94F2@gemini.denx.de> References: <20101129124847.E1D8111D94F2@gemini.denx.de> Cc: Thomas Weber Subject: [U-Boot] [PATCH] OMAP-common/timer: Fix bss usage 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 This patch fixes the bss usage in ARMv7/omap-common/timer.c The .bss section cannot be used before the relocation, because this section is overlayed with .rel.dyn section. Suggested-by: Andreas Biessmann Signed-off-by: Thomas Weber --- arch/arm/cpu/armv7/omap-common/timer.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c index 6b8cf7b..b649b93 100644 --- a/arch/arm/cpu/armv7/omap-common/timer.c +++ b/arch/arm/cpu/armv7/omap-common/timer.c @@ -35,8 +35,8 @@ #include #include -static ulong timestamp; -static ulong lastinc; +static ulong timestamp = 0; +static ulong lastinc = 0; static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE; /* @@ -54,8 +54,6 @@ int timer_init(void) writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST, &timer_base->tclr); - reset_timer_masked(); /* init the timestamp and lastinc value */ - return 0; }