diff options
| author | Chris Zankel <czankel@tensilica.com> | 2005-06-30 05:58:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 11:45:11 -0400 |
| commit | e7d163f7666560c90b163907b9d96ec6207e0f6f (patch) | |
| tree | 88ea7add42a8fec465528ebdb856ed09d4661aa3 /arch/xtensa/boot/boot-elf/Makefile | |
| parent | 82300bf479d7cdf87214b81ca5dc003bbc4f7e8f (diff) | |
[PATCH] xtensa: Removed local copy of zlib and fixed O= support
Removed an unnecessary local copy of zlib (sorry for the add'l traffic).
Fixed 'O=' support (thanks to Jan Dittmer for pointing it out). Some minor
clean-ups in the make files.
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/xtensa/boot/boot-elf/Makefile')
| -rw-r--r-- | arch/xtensa/boot/boot-elf/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile index f6ef6a369667..734db7f76583 100644 --- a/arch/xtensa/boot/boot-elf/Makefile +++ b/arch/xtensa/boot/boot-elf/Makefile | |||
| @@ -27,7 +27,7 @@ Image: vmlinux $(OBJS) | |||
| 27 | --set-section-flags image=contents,alloc,load,load,data \ | 27 | --set-section-flags image=contents,alloc,load,load,data \ |
| 28 | $(OBJS) $@.tmp | 28 | $(OBJS) $@.tmp |
| 29 | $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ | 29 | $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ |
| 30 | -T arch/$(ARCH)/boot/boot-elf/boot.ld \ | 30 | -T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \ |
| 31 | -o arch/$(ARCH)/boot/$@.elf $@.tmp | 31 | -o arch/$(ARCH)/boot/$@.elf $@.tmp |
| 32 | rm -f $@.tmp vmlinux.tmp | 32 | rm -f $@.tmp vmlinux.tmp |
| 33 | 33 | ||
| @@ -41,7 +41,7 @@ Image.initrd: vmlinux $(OBJS) | |||
| 41 | --set-section-flags image=contents,alloc,load,load,data \ | 41 | --set-section-flags image=contents,alloc,load,load,data \ |
| 42 | $(OBJS) $@.tmp | 42 | $(OBJS) $@.tmp |
| 43 | $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ | 43 | $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \ |
| 44 | -T arch/$(ARCH)/boot/boot-elf/boot.ld \ | 44 | -T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \ |
| 45 | -o arch/$(ARCH)/boot/$@.elf $@.tmp | 45 | -o arch/$(ARCH)/boot/$@.elf $@.tmp |
| 46 | rm -f $@.tmp vmlinux.tmp | 46 | rm -f $@.tmp vmlinux.tmp |
| 47 | 47 | ||