[U-Boot-Users] [PATCH 1/1] Add support for ATMEL AT91SAM9G20EK board

[Jean-Christophe PLAGNIOL-VILLARD]

On 15:41 Thu 24 Jul     , Hong Xu wrote:
> >From 81230b02610c06fdc8a175e635851346488e3bdb Mon Sep 17 00:00:00 2001
> From: Hong Xu <hong.xu at atmel.com>
> Date: Thu, 24 Jul 2008 14:25:05 +0800
> Subject: [PATCH 1/1] Add support for ATMEL AT91SAM9G20EK board
>
> This patch adds support for ATMEL AT91SAM9G20EK board.
> User manual for AT91SAM9G20EK board, see
> http://www.atmel.com/dyn/resources/prod_documents/doc6413.pdf
> AT91 SAM9G20 datasheet, see
> http://www.atmel.com/dyn/resources/prod_documents/doc6384.pdf
>
>
> Signed-off-by: Hong Xu <hong.xu at atmel.com>
> ---
>  Makefile                                  |    3 +
>  board/atmel/at91sam9g20ek/Makefile        |   57 +++++++
>  board/atmel/at91sam9g20ek/at91sam9g20ek.c |  250 +++++++++++++++++++++++++++++
>  board/atmel/at91sam9g20ek/config.mk       |    1 +
>  board/atmel/at91sam9g20ek/led.c           |   64 ++++++++
>  board/atmel/at91sam9g20ek/nand.c          |   79 +++++++++
>  board/atmel/at91sam9g20ek/partition.c     |   40 +++++
>  drivers/net/macb.c                        |    4 +-
>  include/asm-arm/arch-at91sam9/hardware.h  |    2 +-
>  include/configs/at91sam9g20ek.h           |  202 +++++++++++++++++++++++
>  include/asm-arm/arch-at91sam9/hardware.h  |    2 +-
>  include/configs/at91sam9g20ek.h           |  202 +++++++++++++++++++++++
>  net/eth.c                                 |    2 +-
Please rebase your code on the branch for-1.3.5 of the u-boot-at91 tree.

> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -415,14 +415,14 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
>       /* choose RMII or MII mode. This depends on the board */
>  #ifdef CONFIG_RMII
>  #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> -    defined(CONFIG_AT91SAM9263)
> +    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
>       macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
>  #else
>       macb_writel(macb, USRIO, 0);
>  #endif
>  #else
>  #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> -    defined(CONFIG_AT91SAM9263)
> +    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
>       macb_writel(macb, USRIO, MACB_BIT(CLKEN));
>  #else
>       macb_writel(macb, USRIO, MACB_BIT(MII));
> diff --git a/net/eth.c b/net/eth.c
> index 38979aa..3f50e2b 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -287,7 +287,7 @@ int eth_initialize(bd_t *bis)
>       mcdmafec_initialize(bis);
>  #endif
>  #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> -    defined(CONFIG_AT91SAM9263)
> +    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
>       at91sam9_eth_initialize(bis);
>  #endif
>       at91sam9_eth_initialize(bis);
>  #endif
>
Same comment as Haavard,
Could please create a CONFIG_SOMETHING for each of this tree block of
ifdef (not neccessarely the same CONFIG)

Best Regards,
J.