From ce04bb41a60b87236ff5294a7508ebb5afc014e4 Mon Sep 17 00:00:00 2001 From: Michael Schwingen Date: Mon, 23 May 2011 00:00:00 +0200 Subject: 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 --- arch/arm/include/asm/global_data.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/include/asm/global_data.h') diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2a84d27a4..c1a59f2c9 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -63,6 +63,9 @@ typedef struct global_data { unsigned long tbu; 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 */ -- cgit v1.2.3-70-g09d2