[U-Boot] [PATCH 3/3] ARM: Update mach-types

Troy Kisky
2012-03-01T22:50:07Z

On 3/1/2012 2:54 PM, Albert ARIBAUD wrote:
> Hi Troy,
>
> Le 01/03/2012 22:13, Troy Kisky a ?crit :
>
>> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
>> index b4610d9..da49ae8 100644
>> --- a/include/configs/ea20.h
>> +++ b/include/configs/ea20.h
>> @@ -24,6 +24,18 @@
>> #define __CONFIG_H
>>
>> /*
>> + * FIXME: This belongs in mach-types.h. However, we only pull
>> mach-types
>> + * from Linus' kernel.org tree.
>> + */
>> +#include<asm/mach-types.h>
>> +#ifdef MACH_TYPE_EA20
>> +#error "MACH_TYPE_EA20 has been defined properly, please remove this."
>> +#else
>> +#define MACH_TYPE_EA20 3002
>> +#endif
>> +
>> +
>> +/*
>
> Sorry if I am being pedantic here, but the "FIXME" comment actually
> belongs *below* the #include line, not above. Ditto for others.

I put it above because when it is moved to mach-types.h, the include
should be deleted as well. That is part of the "FIXME."

>
>> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
>> index 261f952..8589b1d 100644
>> --- a/include/configs/seaboard.h
>> +++ b/include/configs/seaboard.h
>> @@ -45,6 +45,13 @@
>>
>> #define CONFIG_BOARD_EARLY_INIT_F
>>
>> +/*
>> + * FIXME: This belongs in mach-types.h. However, we only pull
>> mach-types
>> + * from Linus' kernel.org tree.
>> + */
>> +#define machine_is_ventana() (0)
>
> Not sure I understand why we have a "machine_ix_xxx()" here. Could you
> explain?
>
> Amicalement,

Because board/nvidia/seaboard/seaboard.c uses machine_is_ventana but
that machine is no longer
in mach-types.

Thanks
Troy