Skip to contentSkip to conversation

ARM/VExpress: fix timer address for TC2 and other VExpress models

PATCH New Andre Przywara 2 participants 3 messages Nov 26, 2013 – Dec 3, 2013 Arm/versatile express platform

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM/VExpress: fix timer address for TC2 and other VExpress models

Commit v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since the hardcoded value for SP804 timer address is wrong on Versatile Express boards using the extended memory map.
Replace this value with an existing macro make it work on both sets of machines.

---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/vexpress_common.h +1 -1
index 6da5e8f..7e78f8a 100644
@@ -132,7 +132,7 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN	(1 << 0)
 
 #define CONFIG_SYS_TIMER_RATE		1000000
-#define CONFIG_SYS_TIMER_COUNTER	(0x10011000 + 0x4)
+#define CONFIG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /* SMSC9115 Ethernet from SMSC9118 family */
Signature · 1 line
1.7.12.1
#1 lore raw

PATCH 1/1 ARM/VExpress: fix timer address for TC2 and other VExpress models

Quoted 7 lines · Andre Przywara

Commit v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since the hardcoded value for SP804 timer address is wrong on Versatile Express boards using the extended memory map.
Replace this value with an existing macro make it work on both sets of machines.

I sent out a similar patch a couple of weeks back:
http://lists.denx.de/pipermail/u-boot/2013-November/167316.html

I don't mind which one goes in, so for this one:

Thanks,
Ian.

Quoted 17 lines
---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/vexpress_common.h +1 -1
index 6da5e8f..7e78f8a 100644
@@ -132,7 +132,7 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN	(1 << 0)
 
 #define CONFIG_SYS_TIMER_RATE		1000000
-#define CONFIG_SYS_TIMER_COUNTER	(0x10011000 + 0x4)
+#define CONFIG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /* SMSC9115 Ethernet from SMSC9118 family */
#2 lore raw

PATCH 1/1 ARM/VExpress: fix timer address for TC2 and other VExpress models

Quoted 7 lines · Ian Campbell
Quoted 6 lines · Andre Przywara

Commit v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since the hardcoded value for SP804 timer address is wrong on Versatile Express boards using the extended memory map.
Replace this value with an existing macro make it work on both sets of machines.

Quoted 7 lines
Quoted 1 line

I sent out a similar patch a couple of weeks back:
http://lists.denx.de/pipermail/u-boot/2013-November/167316.html

I don't mind which one goes in, so for this one:

Thanks Ian and sorry for not searching the list more carefully.

Tom, Albert,

can someone please commit this? This is a serious regression against 2013.10 and reliably hangs u-boot before showing the prompt.

Thanks,
Andre.

Quoted 19 lines
Quoted 17 lines
---
  include/configs/vexpress_common.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/vexpress_common.h +1 -1
index 6da5e8f..7e78f8a 100644
@@ -132,7 +132,7 @@
  #define VEXPRESS_FLASHPROG_FLVPPEN	(1 << 0)
 
  #define CONFIG_SYS_TIMER_RATE		1000000
-#define CONFIG_SYS_TIMER_COUNTER	(0x10011000 + 0x4)
+#define CONFIG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
  #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
  /* SMSC9115 Ethernet from SMSC9118 family */