aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/Makefile
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-10-21 16:10:27 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2008-10-31 18:37:00 -0400
commit0365f707c99bf940a51c2a3ffc19f3ade2f700d4 (patch)
treefc7e48a78d995e31aa1550550724b9e975e2e8dc /arch/cris/Makefile
parent556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff)
[CRIS] Merge asm-offsets.c for both arches into one file.
Eliminates the link to arch specific asm-offsets.c from CRIS architecture build system. Resulting asm-offsets.s are identical before and after change for both arch-v10 and arch-v32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/cris/Makefile')
-rw-r--r--arch/cris/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 22825a7bbe57..241e35bc3b59 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -95,8 +95,6 @@ ifdef CONFIG_ETRAX_ARCH_V32
95endif 95endif
96 @rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S 96 @rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S
97 @ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S 97 @ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
98 @rm -rf $(SRC_ARCH)/kernel/asm-offsets.c
99 @ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
100 @touch $@ 98 @touch $@
101 99
102archclean: 100archclean:
@@ -116,8 +114,8 @@ MRPROPER_FILES += \
116 $(SRC_ARCH)/boot \ 114 $(SRC_ARCH)/boot \
117 $(SRC_ARCH)/lib \ 115 $(SRC_ARCH)/lib \
118 $(SRC_ARCH)/arch \ 116 $(SRC_ARCH)/arch \
119 $(SRC_ARCH)/kernel/vmlinux.lds.S \ 117 $(SRC_ARCH)/kernel/vmlinux.lds.S
120 $(SRC_ARCH)/kernel/asm-offsets.c 118
121 119
122define archhelp 120define archhelp
123 echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' 121 echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'