With support for overlays and calling the -@ flag to dtc we need to have
at least 1.4.3 available now.
Cc: Simon Glass <s...@chromium.org>
Reported-by: Stephen Warren <swar...@wwwdotorg.org>
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
Simon, please make sure to grab this one too with Pantelis' series,
thanks!
---
Makefile | 4 ++--
scripts/dtc-version.sh | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 8250b3409a68..e058e9854b7b 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 e8c94d390baa..0744c39eb04c 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
--
1.9.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
