[PATCH] SA1100: fix building of h3100

[PATCH] SA1100: fix building of h3100

[Dmitry Artamonow]

Both iPaqs h3100 and h3600 currently share the same source
file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
selected, so selecting just CONFIG_SA1100_H3100 results in
"no machine record defined" message and aborted compilation.

Fix it.

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
---
Well, it left unnoticed by me for a while, just because I always build
kernels with _both_ machines compiled in.

 arch/arm/mach-sa1100/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 8a5546e..bb7b819 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -25,6 +25,7 @@ led-$(CONFIG_SA1100_CERF)		+= leds-cerf.o
 
 obj-$(CONFIG_SA1100_COLLIE)		+= collie.o
 
+obj-$(CONFIG_SA1100_H3100)		+= h3600.o
 obj-$(CONFIG_SA1100_H3600)		+= h3600.o
 
 obj-$(CONFIG_SA1100_HACKKIT)		+= hackkit.o
-- 
1.6.3.4

[PATCH] SA1100: fix building of h3100

[Russell King - ARM Linux]

On Mon, Oct 05, 2009 at 09:50:34PM +0400, Dmitry Artamonow wrote:
> Both iPaqs h3100 and h3600 currently share the same source
> file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
> selected, so selecting just CONFIG_SA1100_H3100 results in
> "no machine record defined" message and aborted compilation.

Maybe this is what SA1100_H3XXX was meant for?  Since that symbol's now
gone, we might as well fix it this way.

[PATCH] SA1100: fix building of h3100

[Dmitry Artamonow]

On 11:48 Tue 06 Oct     , Russell King - ARM Linux wrote:
> On Mon, Oct 05, 2009 at 09:50:34PM +0400, Dmitry Artamonow wrote:
> > Both iPaqs h3100 and h3600 currently share the same source
> > file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
> > selected, so selecting just CONFIG_SA1100_H3100 results in
> > "no machine record defined" message and aborted compilation.
> 
> Maybe this is what SA1100_H3XXX was meant for?  Since that symbol's now
> gone, we might as well fix it this way.

Yes, thanks. To be clear - this is a fix meant for 2.6.32.
I think h3600.c should be split in the future anyway, so there's really
no need to revive SA1100_H3XXX.

-- 
Best regards,
Dmitry "MAD" Artamonow

[PATCH] SA1100: fix building of h3100

[Kristoffer Ericson]

On Mon,  5 Oct 2009 21:50:34 +0400
Dmitry Artamonow <mad_soft@inbox.ru> wrote:

> Both iPaqs h3100 and h3600 currently share the same source
> file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
> selected, so selecting just CONFIG_SA1100_H3100 results in
> "no machine record defined" message and aborted compilation.
> 
> Fix it.

Acked

> 
> Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
> ---
> Well, it left unnoticed by me for a while, just because I always build
> kernels with _both_ machines compiled in.
> 
>  arch/arm/mach-sa1100/Makefile |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
> index 8a5546e..bb7b819 100644
> --- a/arch/arm/mach-sa1100/Makefile
> +++ b/arch/arm/mach-sa1100/Makefile
> @@ -25,6 +25,7 @@ led-$(CONFIG_SA1100_CERF)		+= leds-cerf.o
>  
>  obj-$(CONFIG_SA1100_COLLIE)		+= collie.o
>  
> +obj-$(CONFIG_SA1100_H3100)		+= h3600.o
>  obj-$(CONFIG_SA1100_H3600)		+= h3600.o
>  
>  obj-$(CONFIG_SA1100_HACKKIT)		+= hackkit.o
> -- 
> 1.6.3.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


-- 
Kristoffer Ericson <kristoffer.ericson@gmail.com>

[PATCH] SA1100: fix building of h3100

[Russell King - ARM Linux]

On Tue, Oct 06, 2009 at 12:53:18PM +0200, Kristoffer Ericson wrote:
> On Mon,  5 Oct 2009 21:50:34 +0400
> Dmitry Artamonow <mad_soft@inbox.ru> wrote:
> 
> > Both iPaqs h3100 and h3600 currently share the same source
> > file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
> > selected, so selecting just CONFIG_SA1100_H3100 results in
> > "no machine record defined" message and aborted compilation.
> > 
> > Fix it.
> 
> Acked

If there are people seriously looking at H3[16]00 stuff, it would be
a good idea to move it over to use the proper GPIO support rather
than continue to rely upon its own version.

Also maybe splitting it into h3100.c and h3600.c, with (if any) common
bits in h3xxx.c might be an idea?

[PATCH] SA1100: fix building of h3100

[Kristoffer Ericson]

On Tue, 6 Oct 2009 12:28:31 +0100
Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:

> On Tue, Oct 06, 2009 at 12:53:18PM +0200, Kristoffer Ericson wrote:
> > On Mon,  5 Oct 2009 21:50:34 +0400
> > Dmitry Artamonow <mad_soft@inbox.ru> wrote:
> > 
> > > Both iPaqs h3100 and h3600 currently share the same source
> > > file - h3600.c  But Makefile builds it only if CONFIG_SA1100_H3600
> > > selected, so selecting just CONFIG_SA1100_H3100 results in
> > > "no machine record defined" message and aborted compilation.
> > > 
> > > Fix it.
> > 
> > Acked
> 
> If there are people seriously looking at H3[16]00 stuff, it would be
> a good idea to move it over to use the proper GPIO support rather
> than continue to rely upon its own version.

Im not looking specificly at the IPAQ stuff, but it comes in
contact with my jornada work. I agree that moving it into general
GPIO support should be the priority.

> 
> Also maybe splitting it into h3100.c and h3600.c, with (if any) common
> bits in h3xxx.c might be an idea?


-- 
Kristoffer Ericson <kristoffer.ericson@gmail.com>

[PATCH] SA1100: fix building of h3100

[Albert ARIBAUD]

Kristoffer Ericson a ?crit :

>> If there are people seriously looking at H3[16]00 stuff, it would be
>> a good idea to move it over to use the proper GPIO support rather
>> than continue to rely upon its own version.
> 
> Im not looking specificly at the IPAQ stuff, but it comes in
> contact with my jornada work. I agree that moving it into general
> GPIO support should be the priority.

I do have an  iPAQ 3630 and am also interested in moving it to general 
GPIO support. Maybe I can help there?

Amicalement,
-- 
Albert.

[PATCH] SA1100: fix building of h3100

[Dmitry Artamonow]

On 12:28 Tue 06 Oct     , Russell King - ARM Linux wrote:
> If there are people seriously looking at H3[16]00 stuff, it would be
> a good idea to move it over to use the proper GPIO support rather
> than continue to rely upon its own version.

Yes, that's that I'm working on - the plan is to get rid of those horrible
abstracted ipaq egpios, and use gpiolib functions instead (reusing
htc-egpio driver for gpio expander)

I'll try to finish and clean up my patches soon, and submit them for
review, so hopefully they could get into 2.6.33

> Also maybe splitting it into h3100.c and h3600.c, with (if any) common
> bits in h3xxx.c might be an idea?

Yes, as I said, that's the direction I'd like to go too.
After conversion to gpiolib and real gpios there probably will left
not much common at all.

-- 
Best regards,
Dmitry "MAD" Artamonow