| Message ID | 20200225230224.26914-1-masahiroy@kernel.org |
|---|---|
| State | Accepted |
| Commit | ddb87a0b40262ff99d675e946f57427642303938 |
| Headers | show |
| Series | kbuild: remove unused dtc-version.sh script | expand |
On Wed, Feb 26, 2020 at 08:02:24AM +0900, Masahiro Yamada wrote: > 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 <masahiroy at kernel.org> Applied to u-boot/next, thanks!
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 <dtc-command>\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
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 <masahiroy at kernel.org> --- scripts/Kbuild.include | 1 - scripts/dtc-version.sh | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100755 scripts/dtc-version.sh