aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/global_data.h
diff options
context:
space:
mode:
authorMichael Schwingen2011-05-23 00:00:00 +0200
committerAlbert ARIBAUD2011-06-23 08:24:55 +0200
commitce04bb41a60b87236ff5294a7508ebb5afc014e4 (patch)
tree283dab38709b0618948f5bc975487dcd28cff76b /arch/arm/include/asm/global_data.h
parent009e464802569bc97c03c52f76fdf7e38040b634 (diff)
Fix IXP code to work after relocation was added
- jump to real flash location after reset before turning off flash mirror - fix timer system to use HZ == 1000, remove broken interrupt-based code Signed-off-by: Michael Schwingen <michael@schwingen.org>
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
-rw-r--r--arch/arm/include/asm/global_data.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 2a84d27a4e1..c1a59f2c938 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -64,6 +64,9 @@ typedef struct global_data {
unsigned long long timer_reset_value;
unsigned long lastinc;
#endif
+#ifdef CONFIG_IXP425
+ unsigned long timestamp;
+#endif
unsigned long relocaddr; /* Start address of U-Boot in RAM */
phys_size_t ram_size; /* RAM size */
unsigned long mon_len; /* monitor len */