[U-Boot] [PATCH 1/2] [V2] AT91: Makes AT91SAM9263 SoC build correctly against u-boot-atmel/master

[Reinhard Meyer]

Dear Hong Xu,
> Rework for AT91SAM9263 SoC, makes it build again.
> Based on the work for AT91SAM9260-EK.
> 
> Signed-off-by: Hong Xu <hong.xu at atmel.com>
> ---
>  arch/arm/cpu/arm926ejs/at91/lowlevel_init.S        |    2 +-
>  arch/arm/cpu/arm926ejs/at91/timer.c                |   13 ++
>  arch/arm/include/asm/arch-at91/at91_spi.h          |    2 +-
>  arch/arm/include/asm/arch-at91/at91sam9263.h       |   13 ++
>  .../arm/include/asm/arch-at91/at91sam9263_matrix.h |  146 ++++++--------------
>  arch/arm/include/asm/arch-at91/at91sam9_sdramc.h   |    2 +-
>  6 files changed, 71 insertions(+), 107 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c
> index a087687..89a01ea 100644
> --- a/arch/arm/cpu/arm926ejs/at91/timer.c
> +++ b/arch/arm/cpu/arm926ejs/at91/timer.c
> @@ -134,3 +134,16 @@ ulong get_tbclk(void)
>  {
>  	return gd->timer_rate_hz;
>  }
> +
> +/*
> + * Reset the timer.
> + */
> +void reset_timer(void)
> +{
> +	/* TODO: write this code. */
> +}
> +
> +void reset_timer_masked(void)
> +{
> +	/* TODO: write this code. */
> +}

NAK. Those functions were intentionally removed from at91/timer.c
quite a while ago.
If some other code requires them, it must be fixed there.
See also the discussion of the "new timer API" made recently.

Applied (without at91/timer.c changes) to u-boot-atmel/master.

Best Regards,
Reinhard