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/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/Makefile')
-rw-r--r-- | arch/xtensa/Makefile | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 4fa27453b1f..27847e4ffcb 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
@@ -21,23 +21,17 @@ export CPU | |||
21 | 21 | ||
22 | # Platform configuration | 22 | # Platform configuration |
23 | 23 | ||
24 | platform-y := common | ||
25 | platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000 | 24 | platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000 |
26 | platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss | 25 | platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss |
27 | 26 | ||
28 | PLATFORM = $(platform-y) | 27 | PLATFORM = $(platform-y) |
29 | export PLATFORM | 28 | export PLATFORM |
30 | 29 | ||
31 | #LDFLAGS_vmlinux := -T$(word 1,$(LINKSCRIPT)) | 30 | CPPFLAGS += $(if $(KBUILD_SRC),-I$(srctree)/include/asm-xtensa/) |
32 | AFLAGS_vmlinux.lds.o := -Uxtensa | 31 | CPPFLAGS += -Iinclude/asm |
33 | CPPFLAGS += -Iarch/xtensa -Iinclude/asm -mlongcalls -g | 32 | CFLAGS += -pipe -mlongcalls |
34 | AFLAGS += -Iarch/xtensa -Iinclude/asm | ||
35 | CPP = $(CC) -E $(CFLAGS) | ||
36 | 33 | ||
37 | cflags-y += -Iarch/xtensa -pipe -mlongcalls | 34 | KBUILD_DEFCONFIG := iss_defconfig |
38 | |||
39 | |||
40 | KBUILD_DEFCONFIG := common_defconfig | ||
41 | 35 | ||
42 | # ramdisk/initrd support | 36 | # ramdisk/initrd support |
43 | # You need a compressed ramdisk image, named ramdisk.gz in | 37 | # You need a compressed ramdisk image, named ramdisk.gz in |
@@ -62,30 +56,36 @@ endif | |||
62 | LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | 56 | LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) |
63 | 57 | ||
64 | head-y := arch/xtensa/kernel/head.o | 58 | head-y := arch/xtensa/kernel/head.o |
65 | core-y += arch/xtensa/kernel/ \ | 59 | core-y += arch/xtensa/kernel/ arch/xtensa/mm/ |
66 | arch/xtensa/mm/ arch/xtensa/platform-$(PLATFORM)/ | 60 | ifneq ($(PLATFORM),) |
61 | core-y += arch/xtensa/platform-$(PLATFORM)/ | ||
62 | endif | ||
67 | libs-y += arch/xtensa/lib/ $(LIBGCC) | 63 | libs-y += arch/xtensa/lib/ $(LIBGCC) |
68 | 64 | ||
69 | boot := arch/xtensa/boot | 65 | boot := arch/xtensa/boot |
66 | |||
67 | archinc := include/asm-xtensa | ||
70 | 68 | ||
71 | arch/xtensa/kernel/asm-offsets.s: \ | 69 | arch/xtensa/kernel/asm-offsets.s: \ |
72 | arch/xtensa/kernel/asm-offsets.c \ | 70 | arch/xtensa/kernel/asm-offsets.c $(archinc)/.platform |
73 | include/asm-xtensa/.platform | ||
74 | 71 | ||
75 | include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s | 72 | include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s |
76 | $(call filechk,gen-asm-offsets) | 73 | $(call filechk,gen-asm-offsets) |
77 | 74 | ||
78 | prepare: include/asm-xtensa/.platform include/asm-xtensa/offsets.h | 75 | prepare: $(archinc)/.platform $(archinc)/offsets.h |
79 | 76 | ||
80 | # Update machine cpu and platform symlinks if something which affects | 77 | # Update machine cpu and platform symlinks if something which affects |
81 | # them changed. | 78 | # them changed. |
82 | 79 | ||
83 | include/asm-xtensa/.platform: $(wildcard include/config/arch/*.h) | 80 | $(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/MARKER |
84 | @echo ' Setting up cpu ($(CPU)) and platform ($(PLATFORM)) symlinks' | 81 | @echo ' SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)' |
85 | $(Q)rm -f include/asm-xtensa/platform | 82 | $(Q)mkdir -p $(archinc) |
86 | $(Q)rm -f include/asm-xtensa/xtensa/config | 83 | $(Q)mkdir -p $(archinc)/xtensa |
87 | $(Q)(cd include/asm-xtensa/; ln -sf platform-$(PLATFORM) platform) | 84 | $(Q)ln -fsn $(srctree)/$(archinc)/xtensa/config-$(CPU) $(archinc)/xtensa/config |
88 | $(Q)(cd include/asm-xtensa/xtensa; ln -sf config-$(CPU) config) | 85 | @echo ' SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)' |
86 | $(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform | ||
87 | @touch $@ | ||
88 | |||
89 | 89 | ||
90 | all: zImage | 90 | all: zImage |
91 | 91 | ||
@@ -94,7 +94,9 @@ bzImage : zImage | |||
94 | zImage zImage.initrd: vmlinux | 94 | zImage zImage.initrd: vmlinux |
95 | $(Q)$(MAKE) $(build)=$(boot) $@ | 95 | $(Q)$(MAKE) $(build)=$(boot) $@ |
96 | 96 | ||
97 | CLEAN_FILES += arch/xtensa/vmlinux.lds include/asm-xtensa/offset.h | 97 | CLEAN_FILES += arch/xtensa/vmlinux.lds $(archinc)/offset.h \ |
98 | $(archinc)/platform $(archinc)/xtensa/config \ | ||
99 | $(archinc)/.platform | ||
98 | 100 | ||
99 | define archhelp | 101 | define archhelp |
100 | @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' | 102 | @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' |