From patchwork Tue Aug 21 21:55:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 144782 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51196ljw; Tue, 21 Aug 2018 14:55:31 -0700 (PDT) X-Google-Smtp-Source: AA+uWPx942WFl36aYCnhr59MYCDbveMa0Xb3VykWXhYEdBlGR9KIYkZ7ApV31g/lCY9iFRZu4Cqz X-Received: by 2002:a63:b914:: with SMTP id z20-v6mr21341370pge.396.1534888531740; Tue, 21 Aug 2018 14:55:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888531; cv=none; d=google.com; s=arc-20160816; b=YH9gAzD1PtJpQy1pb4t9kqwsNGmG+6HznpW3nuEO8IJZKQXmx36l80XofArm5CCJfd Cc8JAuymDFSF8SgWirjCmApmkKxeNw2YsDYuYaBCT1xUcUMSf+wgh4xoUiuk7rnW2Bcw 2ZMPmX2wmR2mG22SBQlbCic61MziG7l+WesAHBi9IpfxXnHRjaHxVw5YeDYUndP3NmJf 5rpiQ497FbjZ2aVi3+a6yl/8Xrw3E3ANuZ9lAc9CzlxNIwv9UqPTu2BSqmKSpcaZsAuL Obs4GgMWXXGwJVSwzpj/sP9PDl52q7vU2aEmXD3MkKTc5wXhUbZ8c6zNqaDc0GjmcdU/ PxlA== 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:arc-authentication-results; bh=4S1daCR3ZtCuOBHquMDzc59uu6/EI9fyj4GqMNqOxDI=; b=0J7Jr1FlZMDDViVcDvxsr8DMsZAwcJB50loLzdLngIo21Xzhef7OuC7YHUQzmuSBb6 Sohuhsu5W+Pvkg9rx57NOkiZ6UOdl2v9keyxTwA/Xwpv/zUYdkXJuU99MUdXPEtdMS5i ZNNDS8u4PQYlmsVpJd2I8kJb295u9tAAC9sVymNW+HHOELAw92aBT4TfqPjS36t+Q40V ovsCQnh+tsymiRgRYri2G3F9q+adJ4GR9aCwZYqSHc784YKEOQB3lsISZxHq69IbgpuA jBtiveN/ECqXy/g6tO1QzsDiV5m9v90H2I7mlr1IiTZMsVpOQ7Va+WhCvAjzt03wxVyZ r9Vg== 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 s9-v6si13015549pgk.384.2018.08.21.14.55.30; Tue, 21 Aug 2018 14:55:31 -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 S1727573AbeHVBRX (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:23 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:33620 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727027AbeHVBRX (ORCPT ); Tue, 21 Aug 2018 21:17:23 -0400 Received: by mail-oi0-f67.google.com with SMTP id 8-v6so34840087oip.0; Tue, 21 Aug 2018 14:55:27 -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=4S1daCR3ZtCuOBHquMDzc59uu6/EI9fyj4GqMNqOxDI=; b=AJYGoKU+I+hn4apu0alXSZm37Up5Oqj4F4OpifZg/lwey9B3rlRuL67x0kzXBBaQwh 5hmQO83mrRtx/iomcWB/mB7y5VGh3Rh7U8u0XjgFNKYfyoozs2OtYzK8Lz9LDydhEdIZ 2EAhg0wj5lEPFeFDgM4M9pwhC8bCkHFuErVjez9iOBjdaceQoxjMBpwHRg9OLsr1eaIO e87Av+Ow5XwQYK+Lra65OGu0T6I8diyZDcJS4n34TCqhdiXFdW2LPipu7lzIFzVck+2w hClDw8fA2HgudWfTK0GNHRT+/EQ1TxSUvb7nhDWwaskyh4pGvwRKpWXjIZjUO1cAVu7y ffRQ== X-Gm-Message-State: APzg51AtFJ7vjDTStkt5CMJu02g22AUF5ef6JdpTe0JGEtb8lm7/g3Ia RvhIf2Re4TKs7w2OO5u3BSV13js= X-Received: by 2002:aca:e30b:: with SMTP id a11-v6mr1231757oih.303.1534888527354; Tue, 21 Aug 2018 14:55:27 -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 x126-v6sm18785332oig.15.2018.08.21.14.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:26 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/8] powerpc: build .dtb files in dts directory Date: Tue, 21 Aug 2018 16:55:17 -0500 Message-Id: <20180821215524.23040-2-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821215524.23040-1-robh@kernel.org> References: <20180821215524.23040-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Align powerpc 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: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring --- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/Makefile | 49 ++++++++++++++++------------------ arch/powerpc/boot/dts/Makefile | 1 + 3 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 arch/powerpc/boot/dts/Makefile -- 2.17.1 diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 8397c7bd5880..9bacffa3b72e 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -294,7 +294,7 @@ bootwrapper_install: $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@) %.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@) + $(Q)$(MAKE) $(build)=$(boot)/dts $(patsubst %,$(boot)/dts/%,$@) # Used to create 'merged defconfigs' # To use it $(call) it with the first argument as the base defconfig diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 0fb96c26136f..b201d93e1725 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -381,11 +381,11 @@ $(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperb $(call if_changed,wrap,$(subst $(obj)/zImage.,,$@)) # dtbImage% - a dtbImage is a zImage with an embedded device tree blob -$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE - $(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) +$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE + $(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz) -$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE - $(call if_changed,wrap,$*,,$(obj)/$*.dtb) +$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE + $(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb) # This cannot be in the root of $(src) as the zImage rule always adds a $(obj) # prefix @@ -395,36 +395,33 @@ $(obj)/vmlinux.strip: vmlinux $(obj)/uImage: vmlinux $(wrapperbits) FORCE $(call if_changed,wrap,uboot) -$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) +$(obj)/uImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz) -$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb) +$(obj)/uImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb) -$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) +$(obj)/cuImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz) -$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb) +$(obj)/cuImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb) -$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) +$(obj)/simpleImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz) -$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb) +$(obj)/simpleImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb) -$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz) +$(obj)/treeImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz) -$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE - $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb) +$(obj)/treeImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE + $(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb) -# Rule to build device tree blobs -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE - $(call if_changed_dep,dtc) +# Needed for the above targets to work with dts/fsl/ files +$(obj)/dts/%.dtb: $(obj)/dts/fsl/%.dtb + @cp $< $@ # If there isn't a platform selected then just strip the vmlinux. ifeq (,$(image-y)) diff --git a/arch/powerpc/boot/dts/Makefile b/arch/powerpc/boot/dts/Makefile new file mode 100644 index 000000000000..f66554cd5c45 --- /dev/null +++ b/arch/powerpc/boot/dts/Makefile @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0