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 <w...@denx.de> Cc: Albert Aribaud <albert.u.b...@aribaud.net> Cc: Alexander Graf <ag...@suse.de> Cc: Alexey Brodkin <alexey.brod...@synopsys.com> Cc: Anatolij Gustschin <ag...@denx.de> Cc: Andre Przywara <andre.przyw...@arm.com>, Cc: Andreas Bießmann <andreas.de...@googlemail.com> Cc: Angelo Dureghello <ang...@sysam.it> Cc: Bin Meng <bmeng...@gmail.com> Cc: Daniel Hellstrom <dan...@gaisler.com> Cc: Daniel Schwierzeck <daniel.schwierz...@googlemail.com> Cc: Heiko Schocher <h...@denx.de> Cc: Heinrich Schuchardt <xypron.deb...@gmx.de> Cc: Huan Wang <alison.w...@freescale.com> Cc: Jagan Teki <jt...@openedev.com> Cc: Joe Hershberger <joe.hershber...@ni.com> Cc: Kim Phillips <kim.phill...@freescale.com> Cc: Kyungmin Park <kmp...@infradead.org> Cc: Lukasz Majewski <lu...@denx.de> Cc: Macpaul Lin <macp...@andestech.com> Cc: Marek Vasut <marek.va...@gmail.com> Cc: Marek Vasut <ma...@denx.de> Cc: Masahiro Yamada <yamada.masah...@socionext.com> Cc: Michal Simek <mon...@monstr.eu> Cc: Minkyu Kang <mk7.k...@samsung.com> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org> Cc: Pantelis Antoniou <pa...@antoniou-consulting.com> Cc: Prafulla Wadaskar <prafu...@marvell.com> Cc: Przemyslaw Marczak <p.marc...@samsung.com> Cc: Robert Nelson <robertcnel...@gmail.com> Cc: Scott Wood <scottw...@freescale.com> Cc: Simon Glass <s...@chromium.org> Cc: Sonic Zhang <sonic....@gmail.com> Cc: Stanislav Galabov <sgala...@gmail.com> Cc: Stefan Roese <s...@denx.de> Cc: Stefano Babic <sba...@denx.de> Cc: Stephen Warren <swar...@wwwdotorg.org> Cc: Thomas Chou <tho...@wytron.com.tw> Cc: Tom Rini <tr...@konsulko.com> Cc: Tom Warren <twar...@nvidia.com> Cc: u-boot@lists.denx.de Cc: Vagrant Cascadian <vagr...@debian.org> Cc: Vipin Kumar <vk.vi...@gmail.com> Cc: York Sun <york...@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 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot