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