From patchwork Fri Jul 5 15:14:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11032897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 621B613B1 for ; Fri, 5 Jul 2019 15:15:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51F5B28501 for ; Fri, 5 Jul 2019 15:15:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 463C728AE1; Fri, 5 Jul 2019 15:15:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 367B428508 for ; Fri, 5 Jul 2019 15:15:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725497AbfGEPOw (ORCPT ); Fri, 5 Jul 2019 11:14:52 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:45678 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727090AbfGEPOu (ORCPT ); Fri, 5 Jul 2019 11:14:50 -0400 Received: from grover.flets-west.jp (softbank126026094249.bbtec.net [126.26.94.249]) (authenticated) by conuserg-09.nifty.com with ESMTP id x65FEYof003506; Sat, 6 Jul 2019 00:14:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x65FEYof003506 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562339676; bh=j1X2qsh6YtfDSqime3qySV5hLLz1eF8cUUX82OnMgDs=; h=From:To:Cc:Subject:Date:From; b=rm6csqc1Tk9DadRlazYBhRDKDg4cDmtlXOrmKWA0fRDAOdNVvYRQrxKRTvQCk2ufr 02bG5KER/FYeJCNrem0hPapgW5RO7YnI1Y4gRTOiT3zVZgmQ3exZmfChAEVSPUl8dY UEWy5T9beoVNcZkKljuE6SnG5Gp+rc2M50p9pCUjYa2caY5TGwW9HBSCAuN+VIJUpf +pjgTwlV+vmPHGec+S4nlV2StzcxXpg36UnFinsh8w/dnOTQQAZZfOvqt0khgBxvW0 rpssVZ/DdWsyeJ3taxJ7dr1zwvEso5jUeAaWxEsMlh01yhAaDvsSE32xQvyvmM344k Oy5RMqP4HMF5Q== X-Nifty-SrcIP: [126.26.94.249] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] scripts/tags.sh: drop SUBARCH support for ARM Date: Sat, 6 Jul 2019 00:14:30 +0900 Message-Id: <20190705151431.29122-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Our goal is to have more and more sub-architectures to join the ARM multi-platform, and support them in a single configuration. Remove the ARM SUBARCH support because it is ugly. Signed-off-by: Masahiro Yamada --- scripts/tags.sh | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/scripts/tags.sh b/scripts/tags.sh index cc991e18f4d1..f56edeb08739 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -41,15 +41,13 @@ find_arch_sources() for i in $archincludedir; do prune="$prune -wholename $i -prune -o" done - find ${tree}arch/$1 $ignore $subarchprune $prune -name "$2" \ - -not -type l -print; + find ${tree}arch/$1 $ignore $prune -name "$2" -not -type l -print; } # find sources in arch/$1/include find_arch_include_sources() { - include=$(find ${tree}arch/$1/ $subarchprune \ - -name include -type d -print); + include=$(find ${tree}arch/$1/ -name include -type d -print); if [ -n "$include" ]; then archincludedir="$archincludedir $include" find $include $ignore -name "$2" -not -type l -print; @@ -305,36 +303,6 @@ if [ "${ARCH}" = "um" ]; then else archinclude=${SUBARCH} fi -elif [ "${SRCARCH}" = "arm" -a "${SUBARCH}" != "" ]; then - subarchdir=$(find ${tree}arch/$SRCARCH/ -name "mach-*" -type d -o \ - -name "plat-*" -type d); - mach_suffix=$SUBARCH - plat_suffix=$SUBARCH - - # Special cases when $plat_suffix != $mach_suffix - case $mach_suffix in - "omap1" | "omap2") - plat_suffix="omap" - ;; - esac - - if [ ! -d ${tree}arch/$SRCARCH/mach-$mach_suffix ]; then - echo "Warning: arch/arm/mach-$mach_suffix/ not found." >&2 - echo " Fix your \$SUBARCH appropriately" >&2 - fi - - for i in $subarchdir; do - case "$i" in - *"mach-"${mach_suffix}) - ;; - *"plat-"${plat_suffix}) - ;; - *) - subarchprune="$subarchprune \ - -wholename $i -prune -o" - ;; - esac - done fi remove_structs= From patchwork Fri Jul 5 15:14:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11032893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3DEB912 for ; Fri, 5 Jul 2019 15:14:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2C1E1FFF9 for ; Fri, 5 Jul 2019 15:14:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6ED828A97; Fri, 5 Jul 2019 15:14:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E65631FFF9 for ; Fri, 5 Jul 2019 15:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbfGEPOu (ORCPT ); Fri, 5 Jul 2019 11:14:50 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:45679 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727326AbfGEPOu (ORCPT ); Fri, 5 Jul 2019 11:14:50 -0400 Received: from grover.flets-west.jp (softbank126026094249.bbtec.net [126.26.94.249]) (authenticated) by conuserg-09.nifty.com with ESMTP id x65FEYog003506; Sat, 6 Jul 2019 00:14:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x65FEYog003506 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562339676; bh=TLZp6iyBNM3/w4lOLTuX+yiGDhFcOXm7Hmg3zSZQpk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OtnOwgUYJo9CUGi6k7HB+N9s2s1/CvRxNZMLAP2+o3n7nWrOu+Zn7muQG3Teq4zfK ADZ9cKRY1dG1ab5VZWR9oL4bBO23y28pe0jGeiT9qQ7j9X5SyLmCeEyVLHT3+1kG41 9SV7y2B2ctOl8KuhnedRk0c3sHQTI9CoEgGL7OHhNPTHdu8K6hNA3drmtQFINL6d7O Dl4qaNXOabOXFRfhCxvWj2dvWMVfEcy8wYO1dfS4zS1JstpTx8FoV6woR1EFJnAjHG 9D//mAhoBsF592n/8wrEosTsGruqSecBq+gW9df6yDACgwNhLE1m0OYUSZOO9gX8mi kpDzR+MuagwCQ== X-Nifty-SrcIP: [126.26.94.249] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] scripts/tags.sh: remove unused environment variables from comments Date: Sat, 6 Jul 2019 00:14:31 +0900 Message-Id: <20190705151431.29122-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190705151431.29122-1-yamada.masahiro@socionext.com> References: <20190705151431.29122-1-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This script has no reference to ${ARCH}, ${src}, ${obj}. Signed-off-by: Masahiro Yamada --- scripts/tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tags.sh b/scripts/tags.sh index f56edeb08739..684db72a8386 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -6,7 +6,7 @@ # mode may be any of: tags, TAGS, cscope # # Uses the following environment variables: -# ARCH, SUBARCH, SRCARCH, srctree, src, obj +# SUBARCH, SRCARCH, srctree if [ "$KBUILD_VERBOSE" = "1" ]; then set -x @@ -35,7 +35,7 @@ elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then ALLSOURCE_ARCHS=$(find ${tree}arch/ -mindepth 1 -maxdepth 1 -type d -printf '%f ') fi -# find sources in arch/$ARCH +# find sources in arch/$1 find_arch_sources() { for i in $archincludedir; do