* Re: [Patch 0/8] Remove 'TOPDIR' from Makefiles [not found] ` <20080102095159.GB7815@uranus.ravnborg.org> @ 2008-01-03 4:37 ` WANG Cong 0 siblings, 0 replies; 6+ messages in thread From: WANG Cong @ 2008-01-03 4:37 UTC (permalink / raw) To: Sam Ravnborg; +Cc: WANG Cong, LKML, linux-kbuild, Andrew Morton >Hi Wang. > >You a heads up. I will most likely apply >the remaining of the patches tonight, except the UM stuff >which I hope Jeff to take and the final removal of TOPDIR >may wait a bit. >I want the s390, xfs and um changes to hit -mm at least >and we have several external modules that uses TOPDIR. > >And some of these external modules I care about - not >all of them but some of them. > > Sam Thanks, Sam! Cong ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20080101072922.GE2496@hacking>]
[parent not found: <20080101102010.GD28913@uranus.ravnborg.org>]
[parent not found: <20080101133421.GD2499@hacking>]
[parent not found: <20080102062759.GF2493@hacking>]
[parent not found: <20080102192535.GC11217@uranus.ravnborg.org>]
* Re: (Try #3) [Patch 4/8] CRIS: Remove 'TOPDIR' from Makefiles [not found] ` <20080102192535.GC11217@uranus.ravnborg.org> @ 2008-01-03 17:03 ` Jesper Nilsson 2008-01-03 19:59 ` Sam Ravnborg 0 siblings, 1 reply; 6+ messages in thread From: Jesper Nilsson @ 2008-01-03 17:03 UTC (permalink / raw) To: Sam Ravnborg Cc: WANG Cong, Mikael Starvik, LKML, linux-kbuild, Andrew Morton, dev-etrax, Andreas Schwab On Wed, Jan 02, 2008 at 08:25:35PM +0100, Sam Ravnborg wrote: > On Wed, Jan 02, 2008 at 02:27:59PM +0800, WANG Cong wrote: > > > > Refine it as suggested by Andreas. > > > > --------> > > > > This patch removes TOPDIR from Cris Makefiles. We had the TOPDIR replaced with $(srcdir) already, but this looks better. Compiles OK for both EtraxFS and ARTPEC-3 cpus in our tree. > > Cc: Mikael Starvik <starvik@axis.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: Andreas Schwab <schwab@suse.de> > > Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> > > Added Jesper to Cc and applied. Thanks! > Sam /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (Try #3) [Patch 4/8] CRIS: Remove 'TOPDIR' from Makefiles 2008-01-03 17:03 ` (Try #3) [Patch 4/8] CRIS: " Jesper Nilsson @ 2008-01-03 19:59 ` Sam Ravnborg 0 siblings, 0 replies; 6+ messages in thread From: Sam Ravnborg @ 2008-01-03 19:59 UTC (permalink / raw) To: Jesper Nilsson Cc: WANG Cong, Mikael Starvik, LKML, linux-kbuild, Andrew Morton, dev-etrax, Andreas Schwab On Thu, Jan 03, 2008 at 06:03:22PM +0100, Jesper Nilsson wrote: > On Wed, Jan 02, 2008 at 08:25:35PM +0100, Sam Ravnborg wrote: > > On Wed, Jan 02, 2008 at 02:27:59PM +0800, WANG Cong wrote: > > > > > > Refine it as suggested by Andreas. > > > > > > --------> > > > > > > This patch removes TOPDIR from Cris Makefiles. > > We had the TOPDIR replaced with $(srcdir) already, but this looks better. > > Compiles OK for both EtraxFS and ARTPEC-3 cpus in our tree. Thanks - added a: Tested-by: Jesper Nilsson <jesper.nilsson@axis.com> Sam ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20080101072238.GC2496@hacking>]
[parent not found: <20080101101540.GB28913@uranus.ravnborg.org>]
[parent not found: <jefxxhlkxb.fsf@sykes.suse.de>]
[parent not found: <20080101175754.GC31575@uranus.ravnborg.org>]
[parent not found: <20080102062135.GE2493@hacking>]
* Re: (Try #3) [Patch 2/8] MIPS: Remove 'TOPDIR' from Makefiles [not found] ` <20080102062135.GE2493@hacking> @ 2008-01-11 14:17 ` Ralf Baechle 2008-01-11 17:02 ` Sam Ravnborg 0 siblings, 1 reply; 6+ messages in thread From: Ralf Baechle @ 2008-01-11 14:17 UTC (permalink / raw) To: WANG Cong Cc: Sam Ravnborg, Andreas Schwab, LKML, linux-kbuild, Andrew Morton, linux-mips On Wed, Jan 02, 2008 at 02:21:36PM +0800, WANG Cong wrote: > >> Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)? > >It would be better to use $(LINUXINCLUDE) as we then pull in all config > >symbols too and do not have to hardcode kbuild internal names (include2). > > OK. Refine this patch. LDSCRIPT also needed fixing to get builds in a separate object directory working again. I've applied below fix. Ralf From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001 From: WANG Cong <xiyou.wangcong@gmail.com> Date: Wed, 2 Jan 2008 14:21:36 +0800 Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory. Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> [Ralf: The LDSCRIPT script needed fixing, too] Signed-off-by: Ralf Baechle <ralf@linux-mips.org> diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile index 5332449..7ccd40d 100644 --- a/arch/mips/lasat/image/Makefile +++ b/arch/mips/lasat/image/Makefile @@ -12,11 +12,11 @@ endif MKLASATIMG = mklasatimg MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200 -KERNEL_IMAGE = $(TOPDIR)/vmlinux +KERNEL_IMAGE = vmlinux KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ ) KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ ) -LDSCRIPT= -L$(obj) -Tromscript.normal +LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ -D_kernel_entry=0x$(KERNEL_ENTRY) \ @@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ -D TIMESTAMP=$(shell date +%s) $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) - $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< + $(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $< OBJECTS = head.o kImage.o ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: (Try #3) [Patch 2/8] MIPS: Remove 'TOPDIR' from Makefiles 2008-01-11 14:17 ` (Try #3) [Patch 2/8] MIPS: " Ralf Baechle @ 2008-01-11 17:02 ` Sam Ravnborg 2008-01-14 6:26 ` WANG Cong 0 siblings, 1 reply; 6+ messages in thread From: Sam Ravnborg @ 2008-01-11 17:02 UTC (permalink / raw) To: Ralf Baechle Cc: WANG Cong, Andreas Schwab, LKML, linux-kbuild, Andrew Morton, linux-mips On Fri, Jan 11, 2008 at 02:17:54PM +0000, Ralf Baechle wrote: > On Wed, Jan 02, 2008 at 02:21:36PM +0800, WANG Cong wrote: > > > >> Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)? > > >It would be better to use $(LINUXINCLUDE) as we then pull in all config > > >symbols too and do not have to hardcode kbuild internal names (include2). > > > > OK. Refine this patch. > > LDSCRIPT also needed fixing to get builds in a separate object directory > working again. > > I've applied below fix. Great - I will drop it from my tree. See small comment below. Sam > Ralf > > From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001 > From: WANG Cong <xiyou.wangcong@gmail.com> > Date: Wed, 2 Jan 2008 14:21:36 +0800 > Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory. > > Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> > > [Ralf: The LDSCRIPT script needed fixing, too] > > Signed-off-by: Ralf Baechle <ralf@linux-mips.org> > > diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile > index 5332449..7ccd40d 100644 > --- a/arch/mips/lasat/image/Makefile > +++ b/arch/mips/lasat/image/Makefile > @@ -12,11 +12,11 @@ endif > > MKLASATIMG = mklasatimg > MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200 > -KERNEL_IMAGE = $(TOPDIR)/vmlinux > +KERNEL_IMAGE = vmlinux > KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ ) > KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ ) > > -LDSCRIPT= -L$(obj) -Tromscript.normal > +LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal This needs to read: > +LDSCRIPT= -L$(srctree)/$(src) -Tromscript.normal (There is no difference between src and obj in normal cases but to be consistent it shuld be like above). > > HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ > -D_kernel_entry=0x$(KERNEL_ENTRY) \ > @@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ > -D TIMESTAMP=$(shell date +%s) > > $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) > - $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< > + $(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $< > > OBJECTS = head.o kImage.o > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (Try #3) [Patch 2/8] MIPS: Remove 'TOPDIR' from Makefiles 2008-01-11 17:02 ` Sam Ravnborg @ 2008-01-14 6:26 ` WANG Cong 0 siblings, 0 replies; 6+ messages in thread From: WANG Cong @ 2008-01-14 6:26 UTC (permalink / raw) To: Sam Ravnborg Cc: Ralf Baechle, WANG Cong, Andreas Schwab, LKML, linux-kbuild, Andrew Morton, linux-mips On Fri, Jan 11, 2008 at 06:02:04PM +0100, Sam Ravnborg wrote: >On Fri, Jan 11, 2008 at 02:17:54PM +0000, Ralf Baechle wrote: >> On Wed, Jan 02, 2008 at 02:21:36PM +0800, WANG Cong wrote: >> >> > >> Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)? >> > >It would be better to use $(LINUXINCLUDE) as we then pull in all config >> > >symbols too and do not have to hardcode kbuild internal names (include2). >> > >> > OK. Refine this patch. >> >> LDSCRIPT also needed fixing to get builds in a separate object directory >> working again. >> >> I've applied below fix. > >Great - I will drop it from my tree. > >See small comment below. > > Sam > > >> Ralf >> >> From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001 >> From: WANG Cong <xiyou.wangcong@gmail.com> >> Date: Wed, 2 Jan 2008 14:21:36 +0800 >> Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory. >> >> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> >> >> [Ralf: The LDSCRIPT script needed fixing, too] >> >> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> >> >> diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile >> index 5332449..7ccd40d 100644 >> --- a/arch/mips/lasat/image/Makefile >> +++ b/arch/mips/lasat/image/Makefile >> @@ -12,11 +12,11 @@ endif >> >> MKLASATIMG = mklasatimg >> MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200 >> -KERNEL_IMAGE = $(TOPDIR)/vmlinux >> +KERNEL_IMAGE = vmlinux >> KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ ) >> KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ ) >> >> -LDSCRIPT= -L$(obj) -Tromscript.normal >> +LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal > >This needs to read: >> +LDSCRIPT= -L$(srctree)/$(src) -Tromscript.normal > > >(There is no difference between src and obj in normal cases but to be consistent >it shuld be like above). Agreed. Thank you! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-01-14 6:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080101071311.GA2496@hacking>
[not found] ` <20080102095159.GB7815@uranus.ravnborg.org>
2008-01-03 4:37 ` [Patch 0/8] Remove 'TOPDIR' from Makefiles WANG Cong
[not found] ` <20080101072922.GE2496@hacking>
[not found] ` <20080101102010.GD28913@uranus.ravnborg.org>
[not found] ` <20080101133421.GD2499@hacking>
[not found] ` <20080102062759.GF2493@hacking>
[not found] ` <20080102192535.GC11217@uranus.ravnborg.org>
2008-01-03 17:03 ` (Try #3) [Patch 4/8] CRIS: " Jesper Nilsson
2008-01-03 19:59 ` Sam Ravnborg
[not found] ` <20080101072238.GC2496@hacking>
[not found] ` <20080101101540.GB28913@uranus.ravnborg.org>
[not found] ` <jefxxhlkxb.fsf@sykes.suse.de>
[not found] ` <20080101175754.GC31575@uranus.ravnborg.org>
[not found] ` <20080102062135.GE2493@hacking>
2008-01-11 14:17 ` (Try #3) [Patch 2/8] MIPS: " Ralf Baechle
2008-01-11 17:02 ` Sam Ravnborg
2008-01-14 6:26 ` WANG Cong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).