[U-Boot] [PATCH 1/2] [V2] AT91: Makes AT91SAM9261(9G10) SoC build correctly against u-boot-atmel/master

[Reinhard Meyer]

Dear Hong Xu,
> Rework for AT91SAM9261(9G10) 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/at91sam9261_devices.c  |   45 +++++-------
>  arch/arm/include/asm/arch-at91/at91_spi.h          |    2 +-
>  arch/arm/include/asm/arch-at91/at91sam9261.h       |    1 +
>  .../arm/include/asm/arch-at91/at91sam9261_matrix.h |   77 +++++++++-----------
>  4 files changed, 56 insertions(+), 69 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-at91/at91_spi.h b/arch/arm/include/asm/arch-at91/at91_spi.h
> index c520e89..afe724d 100644
> --- a/arch/arm/include/asm/arch-at91/at91_spi.h
> +++ b/arch/arm/include/asm/arch-at91/at91_spi.h
> @@ -33,7 +33,7 @@ typedef struct at91_spi {
>  	at91_pdc_t	pdc;
>  } at91_spi_t;
>  
> -#ifdef CONFIG_AT91_LEGACY
> +#ifdef CONFIG_ATMEL_LEGACY

This was already fixed by another patch. But the endif statement was not...

>  
>  #define AT91_SPI_CR			0x00		/* Control Register */
>  #define		AT91_SPI_SPIEN		(1 <<  0)		/* SPI Enable */

After fixing at91_spi.h applied to u-boot-atmel/master

Best Regards,
Reinhard