From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Przywara Date: Tue, 03 Dec 2013 09:17:03 +0100 Subject: [U-Boot] [PATCH] ARM/VExpress: fix timer address for TC2 and other VExpress models In-Reply-To: <1385803208.23632.34.camel@dagon.hellion.org.uk> References: <1385475651-17038-1-git-send-email-andre.przywara@linaro.org> <1385803208.23632.34.camel@dagon.hellion.org.uk> Message-ID: <529D937F.9000704@linaro.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 11/30/2013 10:20 AM, Ian Campbell wrote: > On Tue, 2013-11-26 at 15:20 +0100, Andre Przywara wrote: >> 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. >> >> Signed-off-by: Andre Przywara > > 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: > Acked-by: Ian Campbell 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. >> --- >> include/configs/vexpress_common.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h >> index 6da5e8f..7e78f8a 100644 >> --- a/include/configs/vexpress_common.h >> +++ b/include/configs/vexpress_common.h >> @@ -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 */ > >