diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 06:14:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:21 -0500 |
commit | a8c601ca21e790f6a9d996bb0bf31f7496eb9509 (patch) | |
tree | 3a14a41ec3fc4b57ec9d195f2a4365a149c395bc /arch/sparc/Makefile | |
parent | a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (diff) |
sparc,sparc64: unify boot/
Simple unification:
o renamed piggyback to *_32.c/*_64.c
o copied content of Makefile from sparc64 to sparc and guard it
o updated sparc/boot/.gitignore
o deleted remaining files in sparc64/boot
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/Makefile')
-rw-r--r-- | arch/sparc/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 4b39ac68c3b1..efc90711f79d 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
@@ -89,17 +89,16 @@ ifdef CONFIG_KALLSYMS | |||
89 | export kallsyms.o := .tmp_kallsyms2.o | 89 | export kallsyms.o := .tmp_kallsyms2.o |
90 | endif | 90 | endif |
91 | 91 | ||
92 | boot-y := arch/sparc/boot | 92 | boot := arch/sparc/boot |
93 | boot-$(CONFIG_SPARC64) := arch/sparc64/boot | ||
94 | 93 | ||
95 | image zImage tftpboot.img vmlinux.aout: vmlinux | 94 | image zImage tftpboot.img vmlinux.aout: vmlinux |
96 | $(Q)$(MAKE) $(build)=$(boot-y) $(boot-y)/$@ | 95 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
97 | 96 | ||
98 | archclean: | 97 | archclean: |
99 | $(Q)$(MAKE) $(clean)=$(boot-y) | 98 | $(Q)$(MAKE) $(clean)=$(boot) |
100 | 99 | ||
101 | # This is the image used for packaging | 100 | # This is the image used for packaging |
102 | KBUILD_IMAGE := $(boot-y)/zImage | 101 | KBUILD_IMAGE := $(boot)/zImage |
103 | 102 | ||
104 | # Don't use tabs in echo arguments. | 103 | # Don't use tabs in echo arguments. |
105 | ifeq ($(ARCH),sparc) | 104 | ifeq ($(ARCH),sparc) |