arm920t/at91/timer: replace bss variables by gd
authorAndreas Bießmann <andreas.devel@googlemail.com>
Tue, 30 Nov 2010 09:45:06 +0000 (09:45 +0000)
committerReinhard Meyer <u-boot@emk-elektronik.de>
Tue, 7 Dec 2010 21:08:07 +0000 (22:08 +0100)
Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc
bss values in arm920t/at91/timer driver.
The usage of bss values in driver before initialisation of bss is
forbidden. In that special case some data in .rel.dyn gets corrupted by
the arm920t/at91/timer driver.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
arch/arm/cpu/arm920t/at91/timer.c
arch/arm/include/asm/global_data.h
include/configs/at91rm9200ek.h

index 91377d47a6e7271d1d61c7491d006bcf49d25e1a..d9a024fc0e86551334a478de2e63c7b9e1fa2384 100644 (file)
 
 #include <common.h>
 
-#include <asm/io.h>
-#include <asm/hardware.h>
+#include <asm/arch/io.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/at91_tc.h>
 #include <asm/arch/at91_pmc.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* the number of clocks per CONFIG_SYS_HZ */
 #define TIMER_LOAD_VAL (CONFIG_SYS_HZ_CLOCK/CONFIG_SYS_HZ)
 
-static u32 timestamp;
-static u32 lastinc;
-
 int timer_init(void)
 {
        at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
@@ -64,8 +63,8 @@ int timer_init(void)
        writel(TIMER_LOAD_VAL, &tc->tc[0].rc);
 
        writel(AT91_TC_CCR_SWTRG | AT91_TC_CCR_CLKEN, &tc->tc[0].ccr);
-       lastinc = 0;
-       timestamp = 0;
+       gd->lastinc = 0;
+       gd->tbl = 0;
 
        return 0;
 }
@@ -86,7 +85,7 @@ ulong get_timer(ulong base)
 
 void set_timer(ulong t)
 {
-       timestamp = t;
+       gd->tbl = t;
 }
 
 void __udelay(unsigned long usec)
@@ -98,8 +97,8 @@ void reset_timer_masked(void)
 {
        /* reset time */
        at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
-       lastinc = readl(&tc->tc[0].cv) & 0x0000ffff;
-       timestamp = 0;
+       gd->lastinc = readl(&tc->tc[0].cv) & 0x0000ffff;
+       gd->tbl = 0;
 }
 
 ulong get_timer_raw(void)
@@ -109,16 +108,16 @@ ulong get_timer_raw(void)
 
        now = readl(&tc->tc[0].cv) & 0x0000ffff;
 
-       if (now >= lastinc) {
+       if (now >= gd->lastinc) {
                /* normal mode */
-               timestamp += now - lastinc;
+               gd->tbl += now - gd->lastinc;
        } else {
                /* we have an overflow ... */
-               timestamp += now + TIMER_LOAD_VAL - lastinc;
+               gd->tbl += now + TIMER_LOAD_VAL - gd->lastinc;
        }
-       lastinc = now;
+       gd->lastinc = now;
 
-       return timestamp;
+       return gd->tbl;
 }
 
 ulong get_timer_masked(void)
index ada3fbb6415cfe6d5a6d7b032743971c9e5be9c7..e459a5dc9494d63857b8fbcbf7b7680a50398326 100644 (file)
@@ -60,6 +60,7 @@ typedef       struct  global_data {
        unsigned long   tbl;
        unsigned long   tbu;
        unsigned long long      timer_reset_value;
+       unsigned long   lastinc;
 #endif
        unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
        phys_size_t     ram_size;       /* RAM size */
index df4413d813dbd1e0b89f794b66f062ac5707519d..810023a49449b2203b1c0ff1cc0119f0be7f7963 100644 (file)
@@ -71,6 +71,8 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
+#define CONFIG_AT91FAMILY
+
 /*
  * Memory Configuration
  */