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/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/Makefile')
-rw-r--r-- | arch/xtensa/boot/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 260f456ccf0b..820b31d10ae4 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile | |||
@@ -11,21 +11,19 @@ | |||
11 | CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include | 11 | CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include |
12 | HOSTFLAGS += -Iarch/$(ARCH)/boot/include | 12 | HOSTFLAGS += -Iarch/$(ARCH)/boot/include |
13 | 13 | ||
14 | BIG_ENDIAN := $(shell echo -e "\#ifdef __XTENSA_EL__\nint little;\n\#else\nint big;\n\#endif" | $(CC) -E -|grep -c big) | 14 | BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") |
15 | |||
16 | 15 | ||
17 | export CFLAGS | 16 | export CFLAGS |
18 | export AFLAGS | 17 | export AFLAGS |
19 | export BIG_ENDIAN | 18 | export BIG_ENDIAN |
20 | 19 | ||
20 | subdir-y := lib | ||
21 | |||
21 | # Subdirs for the boot loader(s) | 22 | # Subdirs for the boot loader(s) |
22 | 23 | ||
23 | bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf | 24 | bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf |
24 | bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf | 25 | bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf |
25 | 26 | ||
26 | subdir-y := lib/ | ||
27 | |||
28 | subdir-y += boot-elf/ boot-redboot/ | ||
29 | 27 | ||
30 | zImage zImage.initrd Image Image.initrd: $(bootdir-y) | 28 | zImage zImage.initrd Image Image.initrd: $(bootdir-y) |
31 | 29 | ||
@@ -33,5 +31,3 @@ $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \ | |||
33 | $(addprefix $(obj)/,$(host-progs)) | 31 | $(addprefix $(obj)/,$(host-progs)) |
34 | $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) | 32 | $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) |
35 | 33 | ||
36 | |||
37 | |||