Skip to content

Commit dbb5f7c

Browse files
rddunlapmasahir0y
authored andcommitted
sparc: unify sparc32/sparc64 archhelp
Currently, entering $ make ARCH=sparc32 help prints the archhelp text for sparc64. ["sparc32" is documented (Documentation/kbuild/kbuild.rst) to be a recognized alias for 32-bit sparc.] Instead of handling ARCH=sparc or ARCH=sparc32 or ARCH=sparc64, just unify all SPARC archhelp text in one place. Fixes: 5e53879 ("sparc,sparc64: unify Makefile") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Suggested-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent c90b3bb commit dbb5f7c

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

arch/sparc/Makefile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,11 @@ vdso_install:
8383
KBUILD_IMAGE := $(boot)/zImage
8484

8585
# Don't use tabs in echo arguments.
86-
ifeq ($(ARCH),sparc)
8786
define archhelp
88-
echo '* image - kernel image ($(boot)/image)'
89-
echo '* zImage - stripped kernel image ($(boot)/zImage)'
87+
echo '* vmlinux - standard SPARC kernel'
88+
echo ' image - kernel image ($(boot)/image)'
89+
echo '* zImage - stripped/compressed kernel image ($(boot)/zImage)'
9090
echo ' uImage - U-Boot SPARC32 Image (only for LEON)'
91+
echo ' vmlinux.aout - a.out kernel for SPARC64'
9192
echo ' tftpboot.img - image prepared for tftp'
9293
endef
93-
else
94-
define archhelp
95-
echo '* vmlinux - standard sparc64 kernel'
96-
echo '* zImage - stripped and compressed sparc64 kernel ($(boot)/zImage)'
97-
echo ' vmlinux.aout - a.out kernel for sparc64'
98-
echo ' tftpboot.img - image prepared for tftp'
99-
endef
100-
endif

0 commit comments

Comments
 (0)