summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-ixp
diff options
context:
space:
mode:
authorMichael Schwingen <michael@schwingen.org>2011-05-23 00:00:00 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-06-23 08:24:55 +0200
commitce04bb41a60b87236ff5294a7508ebb5afc014e4 (patch)
tree283dab38709b0618948f5bc975487dcd28cff76b /arch/arm/include/asm/arch-ixp
parent009e464802569bc97c03c52f76fdf7e38040b634 (diff)
downloadu-boot-imx-ce04bb41a60b87236ff5294a7508ebb5afc014e4.zip
u-boot-imx-ce04bb41a60b87236ff5294a7508ebb5afc014e4.tar.gz
u-boot-imx-ce04bb41a60b87236ff5294a7508ebb5afc014e4.tar.bz2
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/arch-ixp')
-rw-r--r--arch/arm/include/asm/arch-ixp/ixp425.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-ixp/ixp425.h b/arch/arm/include/asm/arch-ixp/ixp425.h
index 2114437..5132607 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)