Eric Lee / smarc-uboot | Embedian Git Server

Commit 2fa73e784da105419b7d9d07d8f9d4a79afe531a

Authored by Tom Rini 2017-09-16 01:15:25 +0800

Exists in smarc_8mq_lf_v2020.04 and in 17 other branches

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>

Showing 2 changed files with 6 additions and 5 deletions Inline Diff

Makefile
scripts/dtc-version.sh

Makefile

Diff comments View file @ 2fa73e7

scripts/dtc-version.sh

Diff comments View file @ 2fa73e7

 #!/bin/sh
 #
 # dtc-version dtc-command
 #
-# Prints the dtc version of `dtc-command' in a canonical 4-digit form
+# Prints the dtc version of `dtc-command' in a canonical 6-digit form
-# such as `0222' for binutils 2.22
+# 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\\n" $MAJOR $MINOR
+printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCH

1	#	1	#
2	# SPDX-License-Identifier: GPL-2.0+	2	# SPDX-License-Identifier: GPL-2.0+
3	#	3	#
4		4
5	VERSION = 2017	5	VERSION = 2017
6	PATCHLEVEL = 09	6	PATCHLEVEL = 09
7	SUBLEVEL =	7	SUBLEVEL =
8	EXTRAVERSION =	8	EXTRAVERSION =
9	NAME =	9	NAME =
10		10
11	# DOCUMENTATION	11	# DOCUMENTATION
12	# To see a list of typical targets execute "make help"	12	# To see a list of typical targets execute "make help"
13	# More info can be located in ./README	13	# More info can be located in ./README
14	# Comments in this file are targeted only to the developer, do not	14	# Comments in this file are targeted only to the developer, do not
15	# expect to learn how to build the kernel reading this file.	15	# expect to learn how to build the kernel reading this file.
16		16
17	# o Do not use make's built-in rules and variables	17	# o Do not use make's built-in rules and variables
18	# (this increases performance and avoids hard-to-debug behaviour);	18	# (this increases performance and avoids hard-to-debug behaviour);
19	# o Look for make include files relative to root of kernel src	19	# o Look for make include files relative to root of kernel src
20	MAKEFLAGS += -rR --include-dir=$(CURDIR)	20	MAKEFLAGS += -rR --include-dir=$(CURDIR)
21		21
22	# Avoid funny character set dependencies	22	# Avoid funny character set dependencies
23	unexport LC_ALL	23	unexport LC_ALL
24	LC_COLLATE=C	24	LC_COLLATE=C
25	LC_NUMERIC=C	25	LC_NUMERIC=C
26	export LC_COLLATE LC_NUMERIC	26	export LC_COLLATE LC_NUMERIC
27		27
28	# Avoid interference with shell env settings	28	# Avoid interference with shell env settings
29	unexport GREP_OPTIONS	29	unexport GREP_OPTIONS
30		30
31	# We are using a recursive build, so we need to do a little thinking	31	# We are using a recursive build, so we need to do a little thinking
32	# to get the ordering right.	32	# to get the ordering right.
33	#	33	#
34	# Most importantly: sub-Makefiles should only ever modify files in	34	# Most importantly: sub-Makefiles should only ever modify files in
35	# their own directory. If in some directory we have a dependency on	35	# their own directory. If in some directory we have a dependency on
36	# a file in another dir (which doesn't happen often, but it's often	36	# a file in another dir (which doesn't happen often, but it's often
37	# unavoidable when linking the built-in.o targets which finally	37	# unavoidable when linking the built-in.o targets which finally
38	# turn into vmlinux), we will call a sub make in that other dir, and	38	# turn into vmlinux), we will call a sub make in that other dir, and
39	# after that we are sure that everything which is in that other dir	39	# after that we are sure that everything which is in that other dir
40	# is now up to date.	40	# is now up to date.