lkml.org 
[lkml]   [2008]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH linux-next 1/1] cris: look for linker scripts in srctree not in objtree
Hi!

On Tue, Jul 01, 2008 at 04:08:44PM +0200, Hinko Kocevar wrote:
> When building kernel with O= linker looks for linker scripts in output tree, while they are located in source tree.
>
> Signed-off-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si>

I think this would be cleaner:

diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -4,7 +4,7 @@

asflags-y += $(LINUXINCLUDE)
ccflags-y += -O2 $(LINUXINCLUDE)
-ldflags-y += -T $(obj)/decompress.ld
+ldflags-y += -T $(srctree)/$(src)/decompress.ld
OBJECTS = $(obj)/head.o $(obj)/misc.o
OBJCOPYFLAGS = -O binary --remove-section=.bss

diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -4,7 +4,7 @@

ccflags-y += -O2 $(LINUXINCLUDE)
asflags-y += $(LINUXINCLUDE)
-ldflags-y += -T $(obj)/rescue.ld
+ldflags-y += -T $(srctree)/$(src)/rescue.ld
OBJCOPYFLAGS = -O binary --remove-section=.bss
obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
OBJECT := $(obj)/head.o

> ---
> diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
> index 9ec5f87..cc6527d 100644
> --- a/arch/cris/arch-v10/boot/compressed/Makefile
> +++ b/arch/cris/arch-v10/boot/compressed/Makefile
> @@ -4,7 +4,7 @@
>
> asflags-y += $(LINUXINCLUDE)
> ccflags-y += -O2 $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/decompress.ld
> +ldflags-y += -T $(srctree)/arch/$(ARCH)/boot/compressed/decompress.ld

> OBJECTS = $(obj)/head.o $(obj)/misc.o
> OBJCOPYFLAGS = -O binary --remove-section=.bss
>
> diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
> index bea8b9c..476007d 100644
> --- a/arch/cris/arch-v10/boot/rescue/Makefile
> +++ b/arch/cris/arch-v10/boot/rescue/Makefile
> @@ -4,7 +4,7 @@
>
> ccflags-y += -O2 $(LINUXINCLUDE)
> asflags-y += $(LINUXINCLUDE)
> -ldflags-y += -T $(obj)/rescue.ld
> +ldflags-y += -T $(srctree)/arch/$(ARCH)/boot/rescue/rescue.ld
> OBJCOPYFLAGS = -O binary --remove-section=.bss
> obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
> OBJECT := $(obj)/head.o

Thanks!

/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com


\
 
 \ /
  Last update: 2008-07-01 18:05    [from the cache]
©2003-2011 Jasper Spaans