From patchwork Thu Apr 13 20:38:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 83086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1309685vqo; Thu, 13 Apr 2023 13:45:08 -0700 (PDT) X-Google-Smtp-Source: AKy350af2+P6QEcREOXxC3WWB7CNgIOcInJs6xQmnvkK+gYz7/aECC91mW5jXgVkULra0gHokg1d X-Received: by 2002:a05:6a20:1a0a:b0:cc:6e9b:c69b with SMTP id cj10-20020a056a201a0a00b000cc6e9bc69bmr2989058pzb.55.1681418708666; Thu, 13 Apr 2023 13:45:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681418708; cv=none; d=google.com; s=arc-20160816; b=KWM1sgZ3E9NEv8TKmOXytA1kbEufBRK/IKSzXMuj4m+UnF4H8jCcmfa+LnPBklzJGt 50rQ+x7HmjPF9pidFe5MWk8wjkDsMho2ogMaKVERAyIc1m5ZNIqzGrV22wHDD6smt/ws UC15h2eM7ZZL5V5aUj3GKbszquyKdTfYbKjgBOPAl6sW5ldieTa64YKWI/bR7BoDNlMf h1mj/sMrFt7SUGMub1xegfFeUwpLniejCQLwgjU67NdyyttNCoCfN8GGO6sV0JoMKWM7 Xx7KT0qeD6/IktIOUdMf2kVWaVC6P61i6IK3hj8RxOnkaigMbnPQRwVvcJmxMCsj8peo tVhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=XWU1TSQ6EOSCyHR4PqujH3tZSHPeiwOeWBbnCTQsrgk=; b=P6oe6kZuU1WI9XH93BjbUP1g7MWhiHxlp+VVzsss9GSWFff+nDdNVgA3yOTvYxifv4 VvQ7FICt9jYF+d+Phk7+qK23ZzjSkn0NivJdwIRj02vLe3L+msC+2WUf7KZbYLM1KsJg ml83RAPphkil+/hN8ZS50jFea8GVL8GUvzR7GY6dnq3I95igNLgzn1kAwneNwkcfnICv PB2fSR1UOkhRjfmYfuHzrWs9aaMmeF+WvhPLBRgt0Khiq2X2+Glh6tFrrZvipE8M/NiI 9shGw4St2s5k71T7DZnVQD2qGYHoNC9aEjHtc7YfCEE0o9ovhZEpX5D5v5X0Yy6PD2Go XljA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=NT8RHiLO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g184-20020a636bc1000000b005194af8319csi2739689pgc.558.2023.04.13.13.44.54; Thu, 13 Apr 2023 13:45:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=NT8RHiLO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229778AbjDMUjH (ORCPT + 99 others); Thu, 13 Apr 2023 16:39:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjDMUjG (ORCPT ); Thu, 13 Apr 2023 16:39:06 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 313FB7ED6; Thu, 13 Apr 2023 13:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=XWU1TSQ6EOSCyHR4PqujH3tZSHPeiwOeWBbnCTQsrgk=; b=NT8RHiLOa3gIdeqzNXIMLjWqQ8 6wsa1JmK7i4y2HoC+OnEu3zAu1FiAq5V5tp1e+Soj5ZMG4v+GxtZygekxp7HC1cYl6sOPHGxHaPmX FwWBLVjJb+SPXKjCKTNb++EBk2VaAiObeTDtXgCz+AxK8Z+8lQqw8/vVTXqOuyfiZ2nqjl+4JYa/F 55cP0/gn0n9bsKJ7VCTt1wvnx7sIDYpjMqp6Oxo5juwL1evFXOo+avLv17qFpZnCBjdaNYmkGZ/gh xhvPSPAeOWB+8j2H5wZTbCimdRLq0GqlrtuvfvaJZzJSOBkfk/1wifqnBothFbKBATPQ+3gfQLXGB LksbYtbw==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pn3ie-0076lX-1d; Thu, 13 Apr 2023 20:39:00 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Sam Ravnborg , "David S. Miller" , sparclinux@vger.kernel.org, Andrew Morton , Masahiro Yamada Subject: [PATCH v3] sparc: unify sparc32/sparc64 archhelp Date: Thu, 13 Apr 2023 13:38:57 -0700 Message-Id: <20230413203857.2629-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763095303829938288?= X-GMAIL-MSGID: =?utf-8?q?1763095303829938288?= 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 Cc: Sam Ravnborg Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Cc: Andrew Morton Suggested-by: Masahiro Yamada --- 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