On 27 September 2011 01:27, Wolfgang Denk wd@denx.de wrote:
#if defined(CONFIG_AT91RM9200) -# include <asm/arch/at91rm9200.h> +# include <asm/arch-at91/at91rm9200.h> #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) || \ defined(CONFIG_AT91SAM9XE) -# include <asm/arch/at91sam9260.h> +# include <asm/arch-at91/at91sam9260.h> #elif defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) -# include <asm/arch/at91sam9261.h> +# include <asm/arch-at91/at91sam9261.h> #elif defined(CONFIG_AT91SAM9263) -# include <asm/arch/at91sam9263.h> +# include <asm/arch-at91/at91sam9263.h> #elif defined(CONFIG_AT91SAM9RL) -# include <asm/arch/at91sam9rl.h> +# include <asm/arch-at91/at91sam9rl.h> #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) -# include <asm/arch/at91sam9g45.h> +# include <asm/arch-at91/at91sam9g45.h> #elif defined(CONFIG_AT91CAP9) -# include <asm/arch/at91cap9.h> +# include <asm/arch-at91/at91cap9.h> #elif defined(CONFIG_AT91X40) -# include <asm/arch/at91x40.h> +# include <asm/arch-at91/at91x40.h>
All these modifications are bogus and should be removed. They are not needed either.
The bogusity of the above modifications come from my confusion - there are two include files:
./arch/arm/include/asm/arch-at91/at91rm9200.h ./arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
which have overlapping interests in defining the memory mapped registers (one for c and the other for asm) it would seem.