build error on Linux-2.6.15-omap1

build error on Linux-2.6.15-omap1

[Hiroki Kaminaga]

Hi,

I'm building linux 2.6.15, and applied Linux-2.6.15-omap1.
When I tried to build for OSK5912, with CONFIG_PM=y (this is default),
following error was emitted.

--
make[2]: *** No rule to make target `arch/arm/mach-omap1/pm.o', needed by `arch/arm/mach-omap1/built-in.o'.  Stop.
make[1]: *** [arch/arm/mach-omap1] Error 2
--

I'm not sure which is better way to fix,

1) mv pm.c (and Sleep.S) from plat-omap/ to mach-omap1/, or
2) move `obj-$(CONFIG_PM) += pm.o sleep.o' line from mach-omap1/Makefile to
   plat-omap/Makefile


Best Regards,

HK.
--

Re: build error on Linux-2.6.15-omap1

[Kristian Mueller]

Hi Hiroki

On Do, 2006-01-12 at 13:51 +0900, Hiroki Kaminaga wrote:
> [..]
> I'm building linux 2.6.15, and applied Linux-2.6.15-omap1.
> When I tried to build for OSK5912, with CONFIG_PM=y (this is default),
> [..]
> 1) mv pm.c (and Sleep.S) from plat-omap/ to mach-omap1/, or

I guess there must be something wrong with your patch since in
linux-2.6.15-omap1 pm.c and Sleep.S are already in mach-omap1 

That is since 1st december last year:
http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=a57a89ee9ad70186e4f7be46e0930fcb8fb53bb6


Greetings

Kristian
-- 

Re: build error on Linux-2.6.15-omap1

[Hiroki Kaminaga]

Hi,

> I guess there must be something wrong with your patch since in
> linux-2.6.15-omap1 pm.c and Sleep.S are already in mach-omap1 
> 
> That is since 1st december last year:
> http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=a57a89ee9ad70186e4f7be46e0930fcb8fb53bb6
> 

Oh!
It is fixed in source code management system!

However, I looked Linux-2.6.15-omap1 patch again, and it was as follows:

* * *

diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/mach-omap1/pm.c
similarity index 83%
rename from arch/arm/plat-omap/pm.c
rename to arch/arm/mach-omap1/pm.c
index 1a24e2c..d483ac4 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -40,22 +40,26 @@
 #include <linux/proc_fs.h>
 #include <linux/pm.h>
 #include <linux/interrupt.h>
+#include <linux/sysfs.h>
+#include <linux/module.h>
... 

* * *

the `+++' part is mach-omap1, but `---' part was plat-omap, and
after patching, pm.c was still in plat-omap...

I'm using FC3 as host, diff version 2.8.1, patch version 2.5.4, 
I guess `rename from' and `rename to' line didn't do what is intended?!


# Or I'm downloading different file? I downloaded:
# http://www.muru.com/linux/omap/ -> Linux-2.6.15-omap1


Best Regards,

HK.
--

Re: build error on Linux-2.6.15-omap1

[Tony Lindgren]

* Hiroki Kaminaga <kaminaga@sm.sony.co.jp> [060112 03:36]:
> Hi,
> 
> > I guess there must be something wrong with your patch since in
> > linux-2.6.15-omap1 pm.c and Sleep.S are already in mach-omap1 
> > 
> > That is since 1st december last year:
> > http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=a57a89ee9ad70186e4f7be46e0930fcb8fb53bb6
> > 
> 
> Oh!
> It is fixed in source code management system!
> 
> However, I looked Linux-2.6.15-omap1 patch again, and it was as follows:
> 
> * * *
> 
> diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/mach-omap1/pm.c
> similarity index 83%
> rename from arch/arm/plat-omap/pm.c
> rename to arch/arm/mach-omap1/pm.c
> index 1a24e2c..d483ac4 100644
> --- a/arch/arm/plat-omap/pm.c
> +++ b/arch/arm/mach-omap1/pm.c
> @@ -40,22 +40,26 @@
>  #include <linux/proc_fs.h>
>  #include <linux/pm.h>
>  #include <linux/interrupt.h>
> +#include <linux/sysfs.h>
> +#include <linux/module.h>
> ... 
> 
> * * *
> 
> the `+++' part is mach-omap1, but `---' part was plat-omap, and
> after patching, pm.c was still in plat-omap...
> 
> I'm using FC3 as host, diff version 2.8.1, patch version 2.5.4, 
> I guess `rename from' and `rename to' line didn't do what is intended?!

Ah, thanks for catching it! This sounds like a bug in git. I've been
using this to generate the patch:

$ git diff 88026842b0a760145aa71d69e74fbc9ec118ca44..165e0bcd61404f0418fc70f07a6a23124fa0d206 
 
> # Or I'm downloading different file? I downloaded:
> # http://www.muru.com/linux/omap/ -> Linux-2.6.15-omap1

No that's right. I'll produce 2.6.15-omap2 patch soon and will fix it in
the patch.

Regards,

Tony