[U-Boot] [PATCH 5/9 V4] convert common files to new SoC access

Daniel Gorsulowski
2010-02-11T07:38:42Z

Daniel Gorsulowski wrote:
> Hello Jens,
>
> Jens Scharsig wrote:
>> * add's a warning to all files, which need update to new SoC access
>> * convert common files in cpu/../at91 and a lot of drivers to use
>> c stucture SoC access
>>
>>
>> Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
>
> <snip>
>
>> diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
>> index 9a48783..e0cf1e1 100644
>> --- a/drivers/i2c/soft_i2c.c
>> +++ b/drivers/i2c/soft_i2c.c
>> @@ -30,14 +30,15 @@
>> #include <ioports.h>
>> #include <asm/io.h>
>> #endif
>> -#ifdef CONFIG_AT91RM9200 /* need this for the at91rm9200 */
>> +#if defined(CONFIG_AT91RM9200) || \
>> + defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \
>> + defined(CONFIG_AT91SAM9263)
>> #include <asm/io.h>
>> #include <asm/arch/hardware.h>
>> -#endif
>> -#ifdef CONFIG_AT91SAM9263 /* only valid for AT91SAM9263 */
>> -#include <asm/arch/at91_pmc.h>
> Please don't remove this include. It breaks build on AT91SAM9263 boards who have
> CONFIG_AT91_LEGACY enabled. (e.g. new otc570 board)
>> +#include <asm/arch/at91_pio.h>
>> +#ifdef CONFIG_AT91_LEGACY
>> #include <asm/arch/gpio.h>
>> -#include <asm/arch/io.h>
> dito
>> +#endif
>> #endif
>> #ifdef CONFIG_IXP425 /* only valid for IXP425 */
>> #include <asm/arch/ixp425.h>

I Updated my otc570 board to new SoC access, hence these includes are not needed
anymore.
I can ack this patch as it is.

Best regards,
Daniel Gorsulowski