]> git.hungrycats.org Git - linux/commitdiff
[PATCH] sh: fix EMBEDDED_RAMDISK with O=
authorTom Rini <trini@kernel.crashing.org>
Mon, 18 Oct 2004 16:01:49 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Oct 2004 16:01:49 +0000 (09:01 -0700)
The following fixes EMBEDDED_RAMDISK to work with O=.  The problem was that
we couldn't find the linker script, since we needed to specify the patch to
the source tree for it.  I've tested this with the ramdisk set to both
'ramdisk.gz' and '../ramdisk.gz'.

Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/sh/ramdisk/Makefile

index a22d86bf0c4524e4f76fa25aed8b09b4a16527e1..99e1c68673cfa35eab15ce7f6bdd633408b435a9 100644 (file)
@@ -12,8 +12,9 @@ img := $(subst $(src)//,/,$(src)/$(img))
 
 quiet_cmd_ramdisk = LD      $@
 define cmd_ramdisk
-       $(LD) -T $(src)/ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
+       $(LD) -T $(srctree)/$(src)/ld.script -b binary --oformat $(O_FORMAT) \
+               -o $@ $(img)
 endef
 
-$(obj)/ramdisk.o: $(img) $(src)/ld.script
+$(obj)/ramdisk.o: $(img) $(srctree)/$(src)/ld.script
        $(call cmd,ramdisk)