[U-Boot] [PATCH 01/15] AT91: rework at91sam9260.h

[Andreas Bießmann]

Dear Reinhard Meyer,

Am 18.02.2011 um 13:49 schrieb Reinhard Meyer:

> Signed-off-by: Reinhard Meyer <u-boot at emk-elektronik.de>
> ---
> arch/arm/include/asm/arch-at91/at91sam9260.h |  252 ++++++++++++++------------
> 1 files changed, 132 insertions(+), 120 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h
> index 7fd60b7..dd68485 100644
> --- a/arch/arm/include/asm/arch-at91/at91sam9260.h
> +++ b/arch/arm/include/asm/arch-at91/at91sam9260.h

snip

> @@ -16,145 +22,151 @@
> #define AT91SAM9260_H
> 
> /*
> - * Peripheral identifiers/interrupts.
> + * defines to be used in other places
>  */
> -#define AT91_ID_FIQ		0	/* Advanced Interrupt Controller (FIQ) */

snap

> -#define AT91SAM9260_ID_IRQ2	31	/* Advanced Interrupt Controller (IRQ2) */
> +#define CONFIG_ARM926EJS	/* ARM926EJS Core */
> +#define CONFIG_AT91FAMILY	/* it's a member of AT91 */

these two lines have contra-productive effects.

If one remove these two configs from board configuration header cause of double definition error message he will get

---8<---
clock.c:28:11: error: 'gd_t' has no member named 'cpu_clk_rate_hz'
...
--->8---

cause CONFIG_AT91FAMILY is not defined when including asm/global_data.h. One way out is to include arch/hardware.h in each relevant board specific header. Other solutions are welcome.

regards

Andreas Bießmann