[U-Boot] [PATCH 2/5] Revert "dtc: Switch to building and using our own dtc unless provided"

[Wolfgang Denk]

This reverts commit 36dd5f1b8abcd0aa5f8490b3ef1e4e7ecce2eb8c.

This patch is part of a series which has never been reviewed and
has not been generally accepted by the community.

Signed-off-by: Wolfgang Denk <wd at denx.de>

Cc: Albert Aribaud <albert.u.boot at aribaud.net>
Cc: Alexander Graf <agraf at suse.de>
Cc: Alexey Brodkin <alexey.brodkin at synopsys.com>
Cc: Anatolij Gustschin <agust at denx.de>
Cc: Andre Przywara <andre.przywara at arm.com>,
Cc: Andreas Bießmann <andreas.devel at googlemail.com>
Cc: Angelo Dureghello <angelo at sysam.it>
Cc: Bin Meng <bmeng.cn at gmail.com>
Cc: Daniel Hellstrom <daniel at gaisler.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck at googlemail.com>
Cc: Heiko Schocher <hs at denx.de>
Cc: Heinrich Schuchardt <xypron.debian at gmx.de>
Cc: Huan Wang <alison.wang at freescale.com>
Cc: Jagan Teki <jteki at openedev.com>
Cc: Joe Hershberger <joe.hershberger at ni.com>
Cc: Kim Phillips <kim.phillips at freescale.com>
Cc: Kyungmin Park <kmpark at infradead.org>
Cc: Lukasz Majewski <lukma at denx.de>
Cc: Macpaul Lin <macpaul at andestech.com>
Cc: Marek Vasut <marek.vasut at gmail.com>
Cc: Marek Vasut <marex at denx.de>
Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
Cc: Michal Simek <monstr at monstr.eu>
Cc: Minkyu Kang <mk7.kang at samsung.com>
Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Cc: Pantelis Antoniou <panto at antoniou-consulting.com>
Cc: Prafulla Wadaskar <prafulla at marvell.com>
Cc: Przemyslaw Marczak <p.marczak at samsung.com>
Cc: Robert Nelson <robertcnelson at gmail.com>
Cc: Scott Wood  <scottwood at freescale.com>
Cc: Simon Glass <sjg at chromium.org>
Cc: Sonic Zhang <sonic.adi at gmail.com>
Cc: Stanislav Galabov <sgalabov at gmail.com>
Cc: Stefan Roese <sr at denx.de>
Cc: Stefano Babic <sbabic at denx.de>
Cc: Stephen Warren <swarren at wwwdotorg.org>
Cc: Thomas Chou <thomas at wytron.com.tw>
Cc: Tom Rini <trini at konsulko.com>
Cc: Tom Warren <TWarren at nvidia.com>
Cc: u-boot at lists.denx.de
Cc: Vagrant Cascadian <vagrant at debian.org>
Cc: Vipin Kumar <vk.vipin at gmail.com>
Cc: York Sun <yorksun at freescale.com>
---
 .travis.yml      |  6 ++++--
 Makefile         | 10 ++++++++--
 dts/Kconfig      |  4 ----
 scripts/Makefile |  1 -
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00b2a73a5e..9dfd016da0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,11 @@ addons:
     - grub-efi-ia32-bin
     - rpm2cpio
     - wget
-    - device-tree-compiler
 
 install:
+ # install latest device tree compiler
+ - git clone --depth=1 -b v1.4.3 git://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc
+ - make -j4 -C /tmp/dtc
  # Clone uboot-test-hooks
  - git clone --depth=1 git://github.com/swarren/uboot-test-hooks.git /tmp/uboot-test-hooks
  - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname`
@@ -49,7 +51,7 @@ install:
 
 env:
   global:
-    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin
+    - PATH=/tmp/dtc:/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin
     - PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci
     - BUILD_DIR=build
     - HOSTCC="cc"
diff --git a/Makefile b/Makefile
index b7d5cbb3f9..e058e9854b 100644
--- a/Makefile
+++ b/Makefile
@@ -349,7 +349,7 @@ OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
 PERL		= perl
 PYTHON		?= python
-DTC		?= $(objtree)/scripts/dtc/dtc
+DTC		?= dtc
 CHECK		= sparse
 
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
@@ -872,7 +872,7 @@ endif
 PHONY += dtbs
 dtbs: dts/dt.dtb
 	@:
-dts/dt.dtb: u-boot
+dts/dt.dtb: checkdtc u-boot
 	$(Q)$(MAKE) $(build)=dts dtbs
 
 quiet_cmd_copy = COPY    $@
@@ -1447,6 +1447,12 @@ SYSTEM_MAP = \
 System.map:	u-boot
 		@$(call SYSTEM_MAP,$<) > $@
 
+checkdtc:
+	@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
+
 #########################################################################
 
 # ARM relocations should all be R_ARM_RELATIVE (32-bit) or
diff --git a/dts/Kconfig b/dts/Kconfig
index 44fc9fe36d..b4b7ddc144 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -5,15 +5,11 @@
 config SUPPORT_OF_CONTROL
 	bool
 
-config DTC
-	bool
-
 menu "Device Tree Control"
 	depends on SUPPORT_OF_CONTROL
 
 config OF_CONTROL
 	bool "Run-time configuration via Device Tree"
-	select DTC
 	help
 	  This feature provides for run-time configuration of U-Boot
 	  via a flattened device tree.
diff --git a/scripts/Makefile b/scripts/Makefile
index 9d55241463..3e10c16d59 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -21,4 +21,3 @@ build_docproc: $(obj)/docproc
 
 # Let clean descend into subdirs
 subdir-	+= basic kconfig
-subdir-$(CONFIG_DTC)	+= dtc
-- 
2.13.3