From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Scharsig Date: Sat, 07 Aug 2010 18:52:38 +0200 Subject: [U-Boot] [PATCH V2] AT91 Fix: return value of get_tbclk In-Reply-To: <4BB5F517.9010107@scharsoft.de> References: <4BB5F517.9010107@scharsoft.de> Message-ID: <4C5D8F56.1030809@scharsoft.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de * Fix: return value of get_tbclk * this fixes issue with prematurely restart/retry, if BOOT_RETRY_TIMEOUT is used Signed-off-by: Jens Scharsig --- the V2 supports the actually file structure. the original patch http://lists.denx.de/pipermail/u-boot/2010-April/069415.html use the old directory /cpu/arch structure. arch/arm/cpu/arm920t/at91/timer.c | 2 +- arch/arm/cpu/arm920t/at91rm9200/timer.c | 5 +---- arch/arm/cpu/arm926ejs/at91/timer.c | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c index 91377d4..1c20857 100644 --- a/arch/arm/cpu/arm920t/at91/timer.c +++ b/arch/arm/cpu/arm920t/at91/timer.c @@ -159,5 +159,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk(void) { - return CONFIG_SYS_HZ; + return timer_freq; } diff --git a/arch/arm/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c index 9c54bbe..8db7e76 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/timer.c +++ b/arch/arm/cpu/arm920t/at91rm9200/timer.c @@ -153,8 +153,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk (void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return timer_freq; } diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c index d21eebf..8efc34b 100644 --- a/arch/arm/cpu/arm926ejs/at91/timer.c +++ b/arch/arm/cpu/arm926ejs/at91/timer.c @@ -138,8 +138,5 @@ ulong get_timer(ulong base) */ ulong get_tbclk(void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return timer_freq; } -- 1.7.1