Patchwork [U-Boot] pm9261: add mach-type localy for the board

login
register
mail settings
Submitter Asen Dimov
Date Oct. 28, 2011, 4:10 p.m.
Message ID <1319818248-27364-1-git-send-email-dimov@ronetix.at>
Download mbox | patch
Permalink /patch/122440/
State Rejected
Delegated to: Albert ARIBAUD
Headers show

Comments

Asen Dimov - Oct. 28, 2011, 4:10 p.m.
Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
---
 board/ronetix/pm9261/mach-type.h |   31 +++++++++++++++++++++++++++++++
 board/ronetix/pm9261/pm9261.c    |    1 +
 2 files changed, 32 insertions(+), 0 deletions(-)
 create mode 100644 board/ronetix/pm9261/mach-type.h
Albert ARIBAUD - Oct. 28, 2011, 6:17 p.m.
Hi Asen,

You should copy Ilko as the maintainer, unless you are taking over 
maintainership of this board (and pm9263 and pm9g45), in which case 
please modify MAINTAINERS file as well.

Le 28/10/2011 18:10, Asen Chavdarov Dimov a écrit :
> Signed-off-by: Asen Chavdarov Dimov<dimov@ronetix.at>
> ---
>   board/ronetix/pm9261/mach-type.h |   31 +++++++++++++++++++++++++++++++

NAK. Do not copy-paste mach-type.h, just add the MACH_TYPE_PM9261 define 
in include/configs/pm9261.h.

>   board/ronetix/pm9261/pm9261.c    |    1 +
>   2 files changed, 32 insertions(+), 0 deletions(-)
>   create mode 100644 board/ronetix/pm9261/mach-type.h
>
> diff --git a/board/ronetix/pm9261/mach-type.h b/board/ronetix/pm9261/mach-type.h
> new file mode 100644
> index 0000000..ca07c18
> --- /dev/null
> +++ b/board/ronetix/pm9261/mach-type.h
> @@ -0,0 +1,31 @@
> +/*
> + * This was manually generated from arch/arm/include/asm/mach-types.h
> + * and add this machine ID removed with commit
> + * 47af6f61bcd9fdd5dcf389cff0a7406eba756c6.
> + * Do fix this.
> + */
> +
> +#ifndef __ASM_ARM_MACH_TYPE_PM9261_H
> +#define __ASM_ARM_MACH_TYPE_PM9261_H
> +
> +#ifndef __ASSEMBLY__
> +/* The type of machine we're running on */
> +extern unsigned int __machine_arch_type;
> +#endif
> +
> +/* see arch/arm/kernel/arch.c for a description of these */
> +#define MACH_TYPE_PM9261              1187
> +
> +#ifdef CONFIG_MACH_PM9261
> +# ifdef machine_arch_type
> +#  undef machine_arch_type
> +#  define machine_arch_type	__machine_arch_type
> +# else
> +#  define machine_arch_type	MACH_TYPE_PM9261
> +# endif
> +# define machine_is_pm9261()	(machine_arch_type == MACH_TYPE_PM9261)
> +#else
> +# define machine_is_pm9261()	(0)
> +#endif
> +
> +#endif
> diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
> index 871b94a..e394a93 100644
> --- a/board/ronetix/pm9261/pm9261.c
> +++ b/board/ronetix/pm9261/pm9261.c
> @@ -25,6 +25,7 @@
>    */
>
>   #include<common.h>
> +#include "mach-type.h"

NAK -- you don't need this if you add MACH_TYPE_PM9261.

>   #include<asm/sizes.h>
>   #include<asm/io.h>
>   #include<asm/arch/at91sam9_smc.h>

Same applies to the other two boards -- you can actually submit a single 
patch for all three of them.

Amicalement,
Igor Grinberg - Oct. 31, 2011, 8:46 a.m.
Hi Asen,

On 10/28/11 20:17, Albert ARIBAUD wrote:
> Hi Asen,
> 
> You should copy Ilko as the maintainer, unless you are taking over 
> maintainership of this board (and pm9263 and pm9g45), in which case 
> please modify MAINTAINERS file as well.
> 
> Le 28/10/2011 18:10, Asen Chavdarov Dimov a écrit :
>> Signed-off-by: Asen Chavdarov Dimov<dimov@ronetix.at>
>> ---
>>   board/ronetix/pm9261/mach-type.h |   31 +++++++++++++++++++++++++++++++
> 
> NAK. Do not copy-paste mach-type.h, just add the MACH_TYPE_PM9261 define 
> in include/configs/pm9261.h.

Also, consider using CONFIG_MACH_TYPE (see README).

> 
>>   board/ronetix/pm9261/pm9261.c    |    1 +
>>   2 files changed, 32 insertions(+), 0 deletions(-)
>>   create mode 100644 board/ronetix/pm9261/mach-type.h
>>
>> diff --git a/board/ronetix/pm9261/mach-type.h b/board/ronetix/pm9261/mach-type.h
>> new file mode 100644
>> index 0000000..ca07c18
>> --- /dev/null
>> +++ b/board/ronetix/pm9261/mach-type.h
>> @@ -0,0 +1,31 @@
>> +/*
>> + * This was manually generated from arch/arm/include/asm/mach-types.h
>> + * and add this machine ID removed with commit
>> + * 47af6f61bcd9fdd5dcf389cff0a7406eba756c6.
>> + * Do fix this.
>> + */
>> +
>> +#ifndef __ASM_ARM_MACH_TYPE_PM9261_H
>> +#define __ASM_ARM_MACH_TYPE_PM9261_H
>> +
>> +#ifndef __ASSEMBLY__
>> +/* The type of machine we're running on */
>> +extern unsigned int __machine_arch_type;
>> +#endif
>> +
>> +/* see arch/arm/kernel/arch.c for a description of these */
>> +#define MACH_TYPE_PM9261              1187
>> +
>> +#ifdef CONFIG_MACH_PM9261
>> +# ifdef machine_arch_type
>> +#  undef machine_arch_type
>> +#  define machine_arch_type	__machine_arch_type
>> +# else
>> +#  define machine_arch_type	MACH_TYPE_PM9261
>> +# endif
>> +# define machine_is_pm9261()	(machine_arch_type == MACH_TYPE_PM9261)
>> +#else
>> +# define machine_is_pm9261()	(0)
>> +#endif
>> +
>> +#endif
>> diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
>> index 871b94a..e394a93 100644
>> --- a/board/ronetix/pm9261/pm9261.c
>> +++ b/board/ronetix/pm9261/pm9261.c
>> @@ -25,6 +25,7 @@
>>    */
>>
>>   #include<common.h>
>> +#include "mach-type.h"
> 
> NAK -- you don't need this if you add MACH_TYPE_PM9261.
> 
>>   #include<asm/sizes.h>
>>   #include<asm/io.h>
>>   #include<asm/arch/at91sam9_smc.h>
> 
> Same applies to the other two boards -- you can actually submit a single 
> patch for all three of them.
> 
> Amicalement,
Asen Dimov - Oct. 31, 2011, 9:04 a.m.
Hi Albert,

On 10/28/2011 09:17 PM, Albert ARIBAUD wrote:
> Hi Asen,
>
> You should copy Ilko as the maintainer, unless you are taking over 
> maintainership of this board (and pm9263 and pm9g45), in which case 
> please modify MAINTAINERS file as well.
Ok, I will CC: him next time.
>
> Le 28/10/2011 18:10, Asen Chavdarov Dimov a écrit :
>> Signed-off-by: Asen Chavdarov Dimov<dimov@ronetix.at>
>> ---
>>   board/ronetix/pm9261/mach-type.h |   31 
>> +++++++++++++++++++++++++++++++
>
> NAK. Do not copy-paste mach-type.h, just add the MACH_TYPE_PM9261 
> define in include/configs/pm9261.h.
>
>>   board/ronetix/pm9261/pm9261.c    |    1 +
>>   2 files changed, 32 insertions(+), 0 deletions(-)
>>   create mode 100644 board/ronetix/pm9261/mach-type.h
...
>>   #include<common.h>
>> +#include "mach-type.h"
>
> NAK -- you don't need this if you add MACH_TYPE_PM9261.
>
>>   #include<asm/sizes.h>
>>   #include<asm/io.h>
>>   #include<asm/arch/at91sam9_smc.h>
>
> Same applies to the other two boards -- you can actually submit a 
> single patch for all three of them.
>
Ok.
> Amicalement,
Regards,
Asen

Patch

diff --git a/board/ronetix/pm9261/mach-type.h b/board/ronetix/pm9261/mach-type.h
new file mode 100644
index 0000000..ca07c18
--- /dev/null
+++ b/board/ronetix/pm9261/mach-type.h
@@ -0,0 +1,31 @@ 
+/*
+ * This was manually generated from arch/arm/include/asm/mach-types.h
+ * and add this machine ID removed with commit
+ * 47af6f61bcd9fdd5dcf389cff0a7406eba756c6.
+ * Do fix this.
+ */
+
+#ifndef __ASM_ARM_MACH_TYPE_PM9261_H
+#define __ASM_ARM_MACH_TYPE_PM9261_H
+
+#ifndef __ASSEMBLY__
+/* The type of machine we're running on */
+extern unsigned int __machine_arch_type;
+#endif
+
+/* see arch/arm/kernel/arch.c for a description of these */
+#define MACH_TYPE_PM9261              1187
+
+#ifdef CONFIG_MACH_PM9261
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_PM9261
+# endif
+# define machine_is_pm9261()	(machine_arch_type == MACH_TYPE_PM9261)
+#else
+# define machine_is_pm9261()	(0)
+#endif
+
+#endif
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 871b94a..e394a93 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -25,6 +25,7 @@ 
  */
 
 #include <common.h>
+#include "mach-type.h"
 #include <asm/sizes.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_smc.h>