diff mbox series

[v3] sparc: unify sparc32/sparc64 archhelp

Message ID 20230413203857.2629-1-rdunlap@infradead.org
State New
Headers
Series [v3] sparc: unify sparc32/sparc64 archhelp |

Commit Message

Randy Dunlap April 13, 2023, 8:38 p.m. UTC 
  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: 5e53879008b9 ("sparc,sparc64: unify Makefile")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
---
v2: rebase/resend; add Masahiro to Cc: list
v3: merge (unify) 32/64-bit help text (Masahiro);
    remove Sam's Ack since the patch has changed;

 arch/sparc/Makefile |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

Comments

Masahiro Yamada April 26, 2023, 2:13 p.m. UTC | #1 
On Fri, Apr 14, 2023 at 5:39 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> 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: 5e53879008b9 ("sparc,sparc64: unify Makefile")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: sparclinux@vger.kernel.org
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Suggested-by: Masahiro Yamada <masahiroy@kernel.org>


Applied to linux-kbuild.
Thank you.



> ---
> v2: rebase/resend; add Masahiro to Cc: list
> v3: merge (unify) 32/64-bit help text (Masahiro);
>     remove Sam's Ack since the patch has changed;
>
>  arch/sparc/Makefile |   15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff -- a/arch/sparc/Makefile b/arch/sparc/Makefile
> --- a/arch/sparc/Makefile
> +++ b/arch/sparc/Makefile
> @@ -83,18 +83,11 @@ vdso_install:
>  KBUILD_IMAGE := $(boot)/zImage
>
>  # Don't use tabs in echo arguments.
> -ifeq ($(ARCH),sparc)
>  define archhelp
> -  echo  '* image        - kernel image ($(boot)/image)'
> -  echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
> +  echo  '  vmlinux      - standard SPARC kernel'
> +  echo  '  image        - kernel image ($(boot)/image)'
> +  echo  '* zImage       - stripped/compressed kernel image ($(boot)/zImage)'
>    echo  '  uImage       - U-Boot SPARC32 Image (only for LEON)'
> +  echo  '  vmlinux.aout - a.out kernel for SPARC64'
>    echo  '  tftpboot.img - image prepared for tftp'
>  endef
> -else
> -define archhelp
> -  echo  '* vmlinux      - standard sparc64 kernel'
> -  echo  '* zImage       - stripped and compressed sparc64 kernel ($(boot)/zImage)'
> -  echo  '  vmlinux.aout - a.out kernel for sparc64'
> -  echo  '  tftpboot.img - image prepared for tftp'
> -endef
> -endif
diff mbox series

Patch

diff -- a/arch/sparc/Makefile b/arch/sparc/Makefile
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -83,18 +83,11 @@  vdso_install:
 KBUILD_IMAGE := $(boot)/zImage
 
 # Don't use tabs in echo arguments.
-ifeq ($(ARCH),sparc)
 define archhelp
-  echo  '* image        - kernel image ($(boot)/image)'
-  echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
+  echo  '  vmlinux      - standard SPARC kernel'
+  echo  '  image        - kernel image ($(boot)/image)'
+  echo  '* zImage       - stripped/compressed kernel image ($(boot)/zImage)'
   echo  '  uImage       - U-Boot SPARC32 Image (only for LEON)'
+  echo  '  vmlinux.aout - a.out kernel for SPARC64'
   echo  '  tftpboot.img - image prepared for tftp'
 endef
-else
-define archhelp
-  echo  '* vmlinux      - standard sparc64 kernel'
-  echo  '* zImage       - stripped and compressed sparc64 kernel ($(boot)/zImage)'
-  echo  '  vmlinux.aout - a.out kernel for sparc64'
-  echo  '  tftpboot.img - image prepared for tftp'
-endef
-endif