From patchwork Tue Feb 25 23:02:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1244561 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.a=rsa-sha256 header.s=dec2015msa header.b=jBF8XXnJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Rvc31JlCz9sPR for ; Wed, 26 Feb 2020 10:03:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C4296801F1; Wed, 26 Feb 2020 00:02:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="jBF8XXnJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 58CE080257; Wed, 26 Feb 2020 00:02:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B737C801A0 for ; Wed, 26 Feb 2020 00:02:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=masahiroy@kernel.org Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-10.nifty.com with ESMTP id 01PN2Q1b025701; Wed, 26 Feb 2020 08:02:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 01PN2Q1b025701 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582671747; bh=1zTfnDaOhIBUS8/PN9ImRouTp1cahzPlJ7IRkb2tPtw=; h=From:To:Cc:Subject:Date:From; b=jBF8XXnJewmPAMZ0IFcdkMg/KujGY4xNdgNHGHq6iL6vKPUBXPMw7wGa3HDl3cARH +bzY7S7ZcLs8l5D+lqIv6n4wqvMSJMzBEeXF/lGl50U+yMTkg+mgb4JhS5bhj6WtNf qnV1QH+/gjUMJ5BQQiaTXnVPSZg8htLwp6JQAfe4ssRBSnQrSVk8zTogNAriD109LB v++aaTC6v7kY8uHH+cQVZX6XTxZwSc2VriZeLkA5E5k4Uhoz0vBQoDlW3CEwunQg4s n0ewdwuQ0ngdN2+GHPpsqM9pf6V5yEFUisgoY936JYRYkqCXMd3fmAHT0sDpXDS3uy 0QhMD1votC6BA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: u-boot@lists.denx.de Cc: Masahiro Yamada Subject: [PATCH] kbuild: remove unused dtc-version.sh script Date: Wed, 26 Feb 2020 08:02:24 +0900 Message-Id: <20200225230224.26914-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean This is U-Boot own code, and no longer used since commit 36dd5f1b8abc ("dtc: Switch to building and using our own dtc unless provided"). Prior to that commit, U-Boot relied on an external dtc, so this script was used to check the dtc version. Now U-Boot bundles our own dtc in script/dtc/dtc like Linux kernel. Users are still allowed to pass DTC= option from the command line, but they are supposed to choose correct version of dtc in this case. So, we do not check the dtc version any more. Signed-off-by: Masahiro Yamada --- scripts/Kbuild.include | 1 - scripts/dtc-version.sh | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100755 scripts/dtc-version.sh diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 89f41ee39f..f9d118ad3d 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -147,7 +147,6 @@ cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) # added for U-Boot binutils-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/binutils-version.sh $(AS)) -dtc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/dtc-version.sh $(DTC)) # cc-ldoption # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) diff --git a/scripts/dtc-version.sh b/scripts/dtc-version.sh deleted file mode 100755 index 0744c39eb0..0000000000 --- a/scripts/dtc-version.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# dtc-version dtc-command -# -# Prints the dtc version of `dtc-command' in a canonical 6-digit form -# such as `010404' for dtc 1.4.4 -# - -dtc="$*" - -if [ ${#dtc} -eq 0 ]; then - echo "Error: No dtc command specified." - printf "Usage:\n\t$0 \n" - exit 1 -fi - -MAJOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 1) -MINOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 2) -PATCH=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 3 | cut -d - -f 1) - -printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCH