[U-Boot] [PATCH] OMAP-common/timer: Fix bss usage

Thomas Weber weber at corscience.de
Mon Nov 29 17:08:32 CET 2010


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 <andreas.devel at gmail.com>
Signed-off-by: Thomas Weber <weber at corscience.de>
---
 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 <common.h>
 #include <asm/io.h>
 
-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;
 }
 
-- 
1.7.3.2



More information about the U-Boot mailing list