diff options
| author | Michael Schwingen <michael@schwingen.org> | 2011-05-23 00:00:00 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-06-23 08:24:55 +0200 |
| commit | ce04bb41a60b87236ff5294a7508ebb5afc014e4 (patch) | |
| tree | 283dab38709b0618948f5bc975487dcd28cff76b /arch/arm/include/asm | |
| parent | 009e464802569bc97c03c52f76fdf7e38040b634 (diff) | |
| download | u-boot-ce04bb41a60b87236ff5294a7508ebb5afc014e4.tar.gz u-boot-ce04bb41a60b87236ff5294a7508ebb5afc014e4.tar.xz u-boot-ce04bb41a60b87236ff5294a7508ebb5afc014e4.zip | |
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')
| -rw-r--r-- | arch/arm/include/asm/arch-ixp/ixp425.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-ixp/ixp425.h b/arch/arm/include/asm/arch-ixp/ixp425.h index 2114437dc7..5132607c6a 100644 --- a/arch/arm/include/asm/arch-ixp/ixp425.h +++ b/arch/arm/include/asm/arch-ixp/ixp425.h @@ -391,9 +391,8 @@ #define IXP425_TIMER_REG(x) (IXP425_TIMER_BASE_PHYS+(x)) #endif -#if 0 /* test-only: also defined in npe/include/... */ -#define IXP425_OSTS IXP425_TIMER_REG(IXP425_OSTS_OFFSET) -#endif +/* _B to avoid collision: also defined in npe/include/... */ +#define IXP425_OSTS_B IXP425_TIMER_REG(IXP425_OSTS_OFFSET) #define IXP425_OST1 IXP425_TIMER_REG(IXP425_OST1_OFFSET) #define IXP425_OSRT1 IXP425_TIMER_REG(IXP425_OSRT1_OFFSET) #define IXP425_OST2 IXP425_TIMER_REG(IXP425_OST2_OFFSET) diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 2a84d27a4e..c1a59f2c93 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 */ |