diff options
| author | Simon Glass <sjg@chromium.org> | 2021-09-22 20:34:43 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-19 18:23:07 +0300 |
| commit | d7faa082a57eeeff9b4bbcc45d3dfed747d99a70 (patch) | |
| tree | 379e6890d486041fa52d966a8997eb29fe180c07 | |
| parent | 9c79815c5c11c5cd30fd5a7fb82f96376e7c3a18 (diff) | |
| download | u-boot-d7faa082a57eeeff9b4bbcc45d3dfed747d99a70.tar.xz | |
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>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | scripts/Kbuild.include | 1 | ||||
| -rwxr-xr-x | scripts/dtc-version.sh | 22 |
3 files changed, 24 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 71f468c00a..8845c6fd75 100644 --- 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 a745cc4fcc..09506cb9a7 100644 --- 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 index 0000000000..bd4e818e92 --- /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 |