Revert "kbuild: remove unused dtc-version.sh script"

We need this to make building dtc optional. It makes no sense to build our
own dtc if the system one works correctly.

This reverts commit ddb87a0b40262ff99d675e946f57427642303938.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 71f468c00a8fa29b298cb9de0624de7dd9ea2044..8845c6fd750cad30c103ea3fdb67243826e4309d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -756,6 +756,7 @@ F:  include/fdt*
 F:     include/linux/libfdt*
 F:     cmd/fdt.c
 F:     common/fdt_support.c
+F:     scripts/dtc-version.sh
 
 FREEBSD
 M:     Rafal Jaworowski <raj@semihalf.com>

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index a745cc4fccd131436a294060061d03061837291e..09506cb9a7eb7c890ffce3290949fdb322bc1348 100644 (file)
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -148,6 +148,7 @@ 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
new file mode 100755 (executable)
index 0000000..bd4e818
--- /dev/null
+++ b/scripts/dtc-version.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+#
+# 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