From patchwork Wed Sep 27 14:15:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 819197 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3y2KhQ1Txgz9t3m for ; Thu, 28 Sep 2017 00:19:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D25ECC21E3B; Wed, 27 Sep 2017 14:19:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=KHOP_BIG_TO_CC, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3466DC21D64; Wed, 27 Sep 2017 14:18:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1F579C21C51; Wed, 27 Sep 2017 14:18:10 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by lists.denx.de (Postfix) with ESMTPS id B4E8FC21C46 for ; Wed, 27 Sep 2017 14:18:09 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y2Kfn440Fz1qsWP for ; Wed, 27 Sep 2017 16:18:09 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y2Kfn3z9Sz1r0wy for ; Wed, 27 Sep 2017 16:18:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id UL8hjytFV2zt for ; Wed, 27 Sep 2017 16:18:00 +0200 (CEST) X-Auth-Info: dXUfM9IvrgadHywnE1Zu2dRcqUiSqZQ/tLoqUBAuEYY= Received: from janitor.denx.de (unknown [62.91.23.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Wed, 27 Sep 2017 16:18:00 +0200 (CEST) Received: by janitor.denx.de (Postfix, from userid 119) id 824AC4B3; Wed, 27 Sep 2017 16:17:59 +0200 (CEST) Received: from gemini.denx.de (gemini.denx.de [10.4.0.2]) by janitor.denx.de (Postfix) with ESMTPS id 12D9047A; Wed, 27 Sep 2017 16:15:34 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id C468C12036F; Wed, 27 Sep 2017 16:15:33 +0200 (CEST) From: Wolfgang Denk To: u-boot@lists.denx.de Date: Wed, 27 Sep 2017 16:15:21 +0200 Message-Id: <20170927141524.5920-3-wd@denx.de> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170927141524.5920-1-wd@denx.de> References: <1506263222-7080-1-git-send-email-trini@konsulko.com> <20170927141524.5920-1-wd@denx.de> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 27 Sep 2017 14:18:42 +0000 Cc: Prafulla Wadaskar , Vipin Kumar , Alexey Brodkin , Pantelis Antoniou , Joe Hershberger , Przemyslaw Marczak , Kim Phillips , Jagan Teki , Stefan Roese , Marek Vasut , Tom Rini , Angelo Dureghello , Macpaul Lin , Andre Przywara , Sonic Zhang , Scott Wood , Kyungmin Park , Huan Wang , Vagrant Cascadian , Tom Warren , York Sun Subject: [U-Boot] [PATCH 2/5] Revert "dtc: Switch to building and using our own dtc unless provided" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Cc: Albert Aribaud Cc: Alexander Graf Cc: Alexey Brodkin Cc: Anatolij Gustschin Cc: Andre Przywara , Cc: Andreas Bießmann Cc: Angelo Dureghello Cc: Bin Meng Cc: Daniel Hellstrom Cc: Daniel Schwierzeck Cc: Heiko Schocher Cc: Heinrich Schuchardt Cc: Huan Wang Cc: Jagan Teki Cc: Joe Hershberger Cc: Kim Phillips Cc: Kyungmin Park Cc: Lukasz Majewski Cc: Macpaul Lin Cc: Marek Vasut Cc: Marek Vasut Cc: Masahiro Yamada Cc: Michal Simek Cc: Minkyu Kang Cc: Nobuhiro Iwamatsu Cc: Pantelis Antoniou Cc: Prafulla Wadaskar Cc: Przemyslaw Marczak Cc: Robert Nelson Cc: Scott Wood Cc: Simon Glass Cc: Sonic Zhang Cc: Stanislav Galabov Cc: Stefan Roese Cc: Stefano Babic Cc: Stephen Warren Cc: Thomas Chou Cc: Tom Rini Cc: Tom Warren Cc: u-boot@lists.denx.de Cc: Vagrant Cascadian Cc: Vipin Kumar Cc: York Sun --- .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