From patchwork Mon Sep 10 15:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146331 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595372ljw; Mon, 10 Sep 2018 08:04:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZBNe3k4TwXdlIKLWgW6Gc8fv6shrAez8hK5hsfvK+FlBAx1bHp2zSHwR6N4DOFIbBCEC3j X-Received: by 2002:a62:5302:: with SMTP id h2-v6mr24538299pfb.183.1536591858712; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591858; cv=none; d=google.com; s=arc-20160816; b=lSv+oKqLBDyVMcw5eNkg9wNqlPIxPSv8ZwiXFfdACF9TN6yCFa3/R2tpT+1xoDL1xY xAv2aP5fj7oAVYfsMvA64/vV67IvkpmLYcHGND2S/rTB8EF4sAwU3cuPIlJFD1XxSbgi 0NF/j4I1SfYp/QKy/wSrpJrvRjP1n3L7AqucpxZJU2h+PLllJlu+LyKUCNjccwZfcSbg /uYWTmgzLS+PL2KCAyrMFbyRmwzbfbVyv//Os9WBoFljg+osbUlzZeBESqRUSnXIhF30 eSQd0rdaFfWDh+CxwgR0B3eFQhoIXEeI9vqD19keDxJkQ9ZGfma0eG7DOR0H1VncDWmJ 0qGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=FWWpu/rZ73LHeaOx/3FicCXTVC+bW2dp+6ooQF6mKYw=; b=CfKbZQhj+1b6D6bXJEtB+v1nqWjQX524ISJArZTzfzyrcrWLVohuNkTjW33bBlgSES tK2PtLUEnA21H6SH+8aB4OTfxHXSDSc0KXrk2/bAKHnJJs3CCfh12Fdyt0bRvtsQTZrn N1CWUzMrVP4AMLGRVNmiSKAxHBsyiD4+EPkg5HjRqjk07qvN45LKqMDtzGP8tphZBC81 zSD3mrDm5c3kP63vrH3njN6LqRTDtF+OlLw1lb4Gr2bPSqrUFIaj/EvgT03XM0ZlpWja /ccaBI7UxGED3ocCrO/HwKRDa27FGVOZVsgIS7WnOWHAbwWpNzsAMmrVv4zFptZaruL3 oN/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u91-v6si17122333plb.73.2018.09.10.08.04.18; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728418AbeIJT6m (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:42 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34164 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbeIJT6k (ORCPT ); Mon, 10 Sep 2018 15:58:40 -0400 Received: by mail-oi0-f66.google.com with SMTP id 13-v6so40834807ois.1; Mon, 10 Sep 2018 08:04:09 -0700 (PDT) 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=FWWpu/rZ73LHeaOx/3FicCXTVC+bW2dp+6ooQF6mKYw=; b=kefafvhJqGEs+89d7ZqLJgu5lk2d25tW2bOqjFoEcpgyiLVBmggCtOe2pJF9haQS17 REvhNXEmVenIzUKAoleiLZuTWBYBTmhCJs6NSNtsWKIv++n9H3s0hzv17vycz/3d0ZtU F5M2kitc5Zj4fR3l3W6ooB/vn1AIBNSiSPS3KijU9qpxp45pKtHQh5O9OLPwtQbuC8qP BtF7cj0H5YPSYkIqxo2Zt9et+oYzcSdKQCrvwu/NrfHvD1VyY0qWR+zeplT3EicAsru3 7IRPQDoD8rHT39uDt8M8axJ5/FOm0u8ZnU25at9fgyrUWjcztatqBchSHNN6AaARFTMC oOMg== X-Gm-Message-State: APzg51AlIMC7HBQESJyiPBNheNn0q9y1doStBUVNh2X8QifozXns7RZ7 QzqDmXle/crqWF/lqcekYXVrclA= X-Received: by 2002:aca:d0d7:: with SMTP id j84-v6mr23216316oiy.37.1536591848651; Mon, 10 Sep 2018 08:04:08 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k85-v6sm49465631oiy.2.2018.09.10.08.04.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:06 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v3 2/9] nios2: build .dtb files in dts directory Date: Mon, 10 Sep 2018 10:03:56 -0500 Message-Id: <20180910150403.19476-3-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910150403.19476-1-robh@kernel.org> References: <20180910150403.19476-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Align nios2 with other architectures which build the dtb files in the same directory as the dts files. This is also in line with most other build targets which are located in the same directory as the source. This move will help enable the 'dtbs' target which builds all the dtbs regardless of kernel config. This transition could break some scripts if they expect dtb files in the old location. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Rob Herring --- arch/nios2/Makefile | 4 ++-- arch/nios2/boot/Makefile | 4 ---- arch/nios2/boot/dts/Makefile | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 arch/nios2/boot/dts/Makefile -- 2.17.1 diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 8673a79dca9c..50eece1c6adb 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -59,10 +59,10 @@ archclean: $(Q)$(MAKE) $(clean)=$(nios2-boot) %.dtb: | scripts - $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ + $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(nios2-boot)/dts/$@ dtbs: - $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ + $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 2ba23a679732..007586094dde 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile @@ -47,10 +47,6 @@ obj-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += linked_dtb.o targets += $(dtb-y) -# Rule to build device tree blobs with make command -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) install: diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile new file mode 100644 index 000000000000..f66554cd5c45 --- /dev/null +++ b/arch/nios2/boot/dts/Makefile @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0