From patchwork Thu Mar 16 04:11:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Balean X-Patchwork-Id: 739532 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vkFRV03r2z9ryk for ; Thu, 16 Mar 2017 15:12:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=balean.com.au header.i=@balean.com.au header.b="QT439Icv"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 5036CC21C5B; Thu, 16 Mar 2017 04:12:01 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 08C66C21C29; Thu, 16 Mar 2017 04:11:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 28609C21C29; Thu, 16 Mar 2017 04:11:51 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 6B8D7C21C26 for ; Thu, 16 Mar 2017 04:11:50 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id m5so4487486pgk.3 for ; Wed, 15 Mar 2017 21:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=balean.com.au; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JrVh8vqMGXTuaOvRRYHHtO/8DwUoixXc94UxafBrzzQ=; b=QT439IcvKLObDjspwN6QVBcyVq4isBsoSoODP31g4c+SS213Pq1P6e0otTn8WuH7dm 7yR/dLwUrW9meFpK4JNJPNrGQPGVqPaHdZXkrqNzevwq9tHVI+3W+K/tnOoW1Hl7JsoW Gi82+86KDqj7eD8mA07Lwcf8x2se6ezOnYQVA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JrVh8vqMGXTuaOvRRYHHtO/8DwUoixXc94UxafBrzzQ=; b=teH5oP4VjXS7ZZv+m6XaH7/STl9iLMoAadREKl1Ja/9qPXBEgfJ6+2xDJaLOLLr76r sUGtlSZHkUEhVt3decrE9OE+vtXnkIIdALraj2foXm8lGq0YWm7ChI/YUn3yIn1QKciv W0VAlbKWReuiemqLxWc5MiwfM6cbUtVpbSuM9u0CFWXcJsEZ37HkPeNBxqbquEJL1RQy yvVlvW22w1iJRaJjsGhpLSm9g9M+yyh3eV9x2XF49zT9LNmkPadnNTUDvWIldZbfgzuJ gWXXeKYYeeMzY8FiT5/MTO0+Axiw+W7js5PRyITxYakjx+m1p1rLm2SM5y1cj4nal4MD xSjA== X-Gm-Message-State: AFeK/H1saftq+cWem/6lbzf/OcSieSNZ/J1w3L9Y/3qR2UsYtnoqzv8+ZmRnpaOqAOjYVA== X-Received: by 10.98.28.72 with SMTP id c69mr7868052pfc.8.1489637508410; Wed, 15 Mar 2017 21:11:48 -0700 (PDT) Received: from logic.local (249.120.96.58.static.exetel.com.au. [58.96.120.249]) by smtp.gmail.com with ESMTPSA id o5sm6958473pgj.66.2017.03.15.21.11.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Mar 2017 21:11:47 -0700 (PDT) From: James Balean To: u-boot@lists.denx.de Date: Wed, 15 Mar 2017 23:11:31 -0500 Message-Id: <1489637491-8343-1-git-send-email-james@balean.com.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489469893-23319-1-git-send-email-james@balean.com.au> References: <1489469893-23319-1-git-send-email-james@balean.com.au> Cc: Andy Shevchenko , James Balean Subject: [U-Boot] [PATCH v2] Ensure device tree DTS is compiled 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image. Signed-off-by: James Balean Cc: Andy Shevchenko Cc: Simon Glass --- Changes for v2: - Removed trailing '/dts' from paths containing ARCH_PATH dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dts/Makefile b/dts/Makefile index c4ac153..6dfaf57 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -12,10 +12,14 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := unset endif +ARCH_PATH := arch/$(ARCH)/dts +dtb_depends := arch-dtbs + ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb +DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb +dtb_depends += $(DTB:.dtb=.dts) endif $(obj)/dt.dtb: $(DTB) FORCE @@ -23,7 +27,10 @@ $(obj)/dt.dtb: $(DTB) FORCE targets += dt.dtb -$(DTB): arch-dtbs +$(DTB): $(dtb_depends) +ifeq ($(EXT_DTB),) + $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@ +endif $(Q)test -e $@ || ( \ echo >&2; \ echo >&2 "Device Tree Source is not correctly specified."; \ @@ -33,7 +40,7 @@ $(DTB): arch-dtbs /bin/false) arch-dtbs: - $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs + $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs .SECONDARY: $(obj)/dt.dtb.S