From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 23 Feb 2012 12:15:28 +0100
Subject: [U-Boot] [PATCH] microblaze: fix build failure due to undefined
 reference to `get_ticks'
In-Reply-To: <1329946797-530-1-git-send-email-linz@li-pro.net>
References: <1329946797-530-1-git-send-email-linz@li-pro.net>
Message-ID: <4F461FD0.8000607@monstr.eu>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Stephan Linz wrote:
> after commit "common: add possibility for readline_into_buffer
> timeout" (sha1:9c34831) was applied. The Microblaze generic build
> fails with error below:
> 
> common/libcommon.o: In function `cread_line':
> /devel/u-boot/common/main.c:717: undefined reference to `get_ticks'
> /devel/u-boot/common/main.c:717: undefined reference to `get_tbclk'
> /devel/u-boot/common/main.c:720: undefined reference to `get_ticks'
> 
> Signed-off-by: Stephan Linz <linz@li-pro.net>
> Acked-by: Michal Simek <monstr@monstr.eu>
> ---
>  arch/microblaze/cpu/timer.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
> index a167755..1952804 100644
> --- a/arch/microblaze/cpu/timer.c
> +++ b/arch/microblaze/cpu/timer.c
> @@ -62,3 +62,21 @@ int timer_init (void)
>  }
>  #endif
>  #endif
> +
> +/*
> + * This function is derived from PowerPC code (read timebase as long long).
> + * On Microblaze it just returns the timer value.
> + */
> +unsigned long long get_ticks(void)
> +{
> +	return get_timer(0);
> +}
> +
> +/*
> + * This function is derived from PowerPC code (timebase clock frequency).
> + * On Microblaze it returns the number of timer ticks per second.
> + */
> +ulong get_tbclk(void)
> +{
> +	return CONFIG_SYS_HZ;
> +}

Applied.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian