summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-09-15 20:15:25 +0300
committerTom Rini <trini@konsulko.com>2017-09-22 14:40:05 +0300
commit2fa73e784da105419b7d9d07d8f9d4a79afe531a (patch)
tree1eced6b9b943f5ba9a2a8e0b19b16ef697b4c3d9
parent933f67aa56ea742f014b21bfe50a16a00e97b9bd (diff)
downloadu-boot-2fa73e784da105419b7d9d07d8f9d4a79afe531a.tar.xz
Makefile: Update minimum dtc version to 1.4.3
With support for overlays and calling the -@ flag to dtc we need to have at least 1.4.3 available now. Cc: Simon Glass <sjg@chromium.org> Reported-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--Makefile4
-rwxr-xr-xscripts/dtc-version.sh7
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 8250b3409a..e058e9854b 100644
--- a/Makefile
+++ b/Makefile
@@ -1448,8 +1448,8 @@ System.map: u-boot
@$(call SYSTEM_MAP,$<) > $@
checkdtc:
- @if test $(call dtc-version) -lt 0104; then \
- echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \
+ @if test $(call dtc-version) -lt 010403; then \
+ echo '*** Your dtc is too old, please upgrade to dtc 1.4.3 or newer'; \
false; \
fi
diff --git a/scripts/dtc-version.sh b/scripts/dtc-version.sh
index e8c94d390b..0744c39eb0 100755
--- a/scripts/dtc-version.sh
+++ b/scripts/dtc-version.sh
@@ -2,8 +2,8 @@
#
# 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="$*"
@@ -16,5 +16,6 @@ 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\\n" $MAJOR $MINOR
+printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCH