Merge branch 'master-fdt' of https://source.denx.de/u-boot/custodians/u-boot-sh

[thirdparty/u-boot.git] / scripts / dtc-version.sh

diff --git a/scripts/dtc-version.sh b/scripts/dtc-version.sh
old mode 100644 (file)
new mode 100755 (executable)
index e8c94d3..18c59ac
--- a/scripts/dtc-version.sh
+++ b/scripts/dtc-version.sh
@@ -1,20 +1,27 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
 #
 # dtc-version dtc-command
 #
-# Prints the dtc version of `dtc-command' in a canonical 4-digit form
-# such as `0222' for binutils 2.22
+# 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."
+       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)
+if ! which $dtc > /dev/null 2>&1 ; then
+       echo "Error: Cannot find dtc: $dtc"
+       exit 1
+fi
+
+MAJOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 1 | tr -d v)
 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\\n" $MAJOR $MINOR
+printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCH