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 From patchwork Tue Aug 21 21:55:19 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: 144783 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51231ljw; Tue, 21 Aug 2018 14:55:35 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwkTmVy7Zk3vvcAiqm90JTQudtnAKNWyqsXfr5ulmEdexp2Fbm+HUeSwfgvtTPIQMRS0Ccy X-Received: by 2002:a17:902:724c:: with SMTP id c12-v6mr50834954pll.326.1534888534846; Tue, 21 Aug 2018 14:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888534; cv=none; d=google.com; s=arc-20160816; b=FvEl4sV1sB4bEMn/C5UPxJ56OPG4BNh6RybUtJiWO0F4Gm6SxJSYeFgDTiTMZ90Sm/ 5w3JZUYeUNpdHnb68IFLGG28rvNPu1eQqYpDRCjj8SPyvEexqB9UYvEJX5wdpJl4LmbI Vrs6C/6dDbGrG2YKmDBH2vu1o5OxoNKUIAu780hMesJ2kDvbgvDSaZu9evnD/dIz2MXJ +rBTgf0Tu8aRQQX6V2sMIPkN5zoR/ZYXShEhpDZ/a0hEf+69uZ4nP0nxkxWlzSWQiKJJ WJ6k7HT3pS0OVhC1z7GqEevGhAU2ohtj6PrxpJ/cnjveaAtvEJfPwBCU7Jxk6u2Yk5ns Lntg== 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=VBSQfloLiFu+iV9ea+7Ay6RD8pIsDvaRlrrmBcR9emQ=; b=QZ95K3NM9JqDI9hkpEN5oPe3Ax+rNRjCL6pvP88yTdT9r/fslVhBNb0A6Zq1SDpy/g t+SFLsBAZToYA2mB1Idu6kpFqvhZPZ1SzJtfF3YCkaArojhRdP4mHOC5PAK3wOjtLrp5 1zn3my3OI4pIw4TN8/TinpxAZOA+g7T0kVacUapUGosGeh6XucjF6gyneF+3IBNY1Ccb Gx5tZwQMgsLxZH232O2Pe8RPuQpEOyMNUtv/9cgb39nVGmVEiWuno4dSghtXx72RC2c2 m72F5MIb4wJ9r4jRCN9ZT+KhkrIiKuLgKdl+9qGWkcezZCdMa6zrzU5V2IWygH1ChkfY XBmw== 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 w133-v6si14605559pfd.313.2018.08.21.14.55.34; Tue, 21 Aug 2018 14:55:34 -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 S1727745AbeHVBRZ (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:25 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:46828 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727027AbeHVBRZ (ORCPT ); Tue, 21 Aug 2018 21:17:25 -0400 Received: by mail-oi0-f68.google.com with SMTP id y207-v6so34749065oie.13; Tue, 21 Aug 2018 14:55:29 -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=VBSQfloLiFu+iV9ea+7Ay6RD8pIsDvaRlrrmBcR9emQ=; b=dEOK+SM2cBZLI42vE7JLUQoEqm1BCiZ1ibeimDg3Vf/VSVQHSTPFoFPfWYtDOVtW+K FnGbbe/0AJERwRyOw19zJXmrPl4HSYeUK+P0/15t+dX5EdXilOOr2SOxqV/mq+TYlgDX USKnpz/KNYNBek61eOWK8vCj8guZhYB80zGeaeu0yQdGUYoHGJOGKR7yOHYHZ1V6Tr7f oZnlpvDM1zHOQaPml0x/RyOdT+bJvOkz+Ap7A2rLMUb6/7xD4nwe6hPyBWFjGXv73Dml J7VoNXboOhd8jR3VwXoiNLBkau83FZYuB9RGbXyKhtakPD5SyorCFdp+eYDLoho+IoPY /a2A== X-Gm-Message-State: APzg51BMH7XE4cMzW6RhUd1gfrzFSZst8EWcZ2gLuLShjDPe57nBFd8N APRs/OtB5QIQnHvpty90dZqrntI= X-Received: by 2002:aca:df55:: with SMTP id w82-v6mr1220105oig.355.1534888529298; Tue, 21 Aug 2018 14:55:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:28 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH 3/8] nios2: use common rules to build built-in dtb Date: Tue, 21 Aug 2018 16:55:19 -0500 Message-Id: <20180821215524.23040-4-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 Using the common build support for built-in dtb files just requires adding a .dtb.o target to obj-y. This has the side effect that CONFIG_NIOS2_DTB_SOURCE should now be just the dts filename in arch/nios2/boot/dts/ directory. Before any path was supported, but if you want to build in your dtb to the kernel, it should be in the kernel tree. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Rob Herring --- arch/nios2/Makefile | 6 ++---- arch/nios2/boot/Makefile | 14 -------------- arch/nios2/boot/dts/Makefile | 2 ++ arch/nios2/boot/linked_dtb.S | 19 ------------------- 4 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 arch/nios2/boot/linked_dtb.S -- 2.17.1 diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 50eece1c6adb..db2e78fe65c7 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -49,16 +49,14 @@ BOOT_TARGETS = vmImage zImage PHONY += $(BOOT_TARGETS) install KBUILD_IMAGE := $(nios2-boot)/vmImage -ifneq ($(CONFIG_NIOS2_DTB_SOURCE),"") - core-y += $(nios2-boot)/ -endif +core-y += $(nios2-boot)/dts/ all: vmImage archclean: $(Q)$(MAKE) $(clean)=$(nios2-boot) -%.dtb: | scripts +%.dtb %.dtb.S %.dtb.o: | scripts $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(nios2-boot)/dts/$@ dtbs: diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 007586094dde..0b48f1bf086d 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile @@ -31,20 +31,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ -# Rule to build device tree blobs -DTB_SRC := $(patsubst "%",%,$(CONFIG_NIOS2_DTB_SOURCE)) - -# Make sure the generated dtb gets removed during clean -extra-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += system.dtb - -$(obj)/system.dtb: $(DTB_SRC) FORCE - $(call cmd,dtc) - -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - -obj-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += linked_dtb.o - targets += $(dtb-y) $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile index f66554cd5c45..f6358e395b25 100644 --- a/arch/nios2/boot/dts/Makefile +++ b/arch/nios2/boot/dts/Makefile @@ -1 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 + +obj-y := $(patsubst "%.dts",%.dtb.o,$(CONFIG_NIOS2_DTB_SOURCE)) diff --git a/arch/nios2/boot/linked_dtb.S b/arch/nios2/boot/linked_dtb.S deleted file mode 100644 index 071f922db338..000000000000 --- a/arch/nios2/boot/linked_dtb.S +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2011 Thomas Chou - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ -.section .dtb.init.rodata,"a" -.incbin "arch/nios2/boot/system.dtb" From patchwork Tue Aug 21 21:55:20 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: 144788 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51553ljw; Tue, 21 Aug 2018 14:56:02 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxxzKugrsPenfVN2EY1AIUgwOml2uboLn2ZS8jjzjF/FYMWxKb1PSjLVIUUHBMj9WqGOSbL X-Received: by 2002:a17:902:2:: with SMTP id 2-v6mr17967493pla.181.1534888562704; Tue, 21 Aug 2018 14:56:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888562; cv=none; d=google.com; s=arc-20160816; b=mSf9ppF3N0qRzOmkvaRAPYZoWAhTLCHfmFG6yA8xN6KP9vRwQoQJgm4bNt4YdU5wMc u+RKSkW0FCi2sKqaED1Ra3EoiiIgFw66aX151hGxK6FAFCPKTSSsWxzvAeXtbfeiwAa6 y5HDzcQB+7CPM1lQyBF/6te+VXMQzmbIgK+1t/ndzPRBk2BOqcSYawvkp4F+hPef/j3I NaTNvdBhU6M2NBEdAgB5GLY6MS999IIrmkbidcw2HZmQlKOanpkLgIN4nxkHQwPSpgFS 7g3bBU0T6Y+WUFzE++8XuG6QeJ0iPUmQdZdlED5YECm3KzK6sfOh+JrC3xV7J+wTOB1J S1sw== 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=96bgZeDJu8lmzLzGQEjyQG1f1/HFZ+sSY2PjMNDbDoY=; b=P+lrMqyaOwUrjEJPH+qIAhLT3A6sfFYU3PJpaUeVpSGnXMD2gFeyzFEsL59uA6yoJ+ GSzWM1nz6MpwlJC850ydVQGC9LX6VQlzUwlhEwKhbUudGmuMEv7wTsKypslIAONFioBk hjE3hbqtDKILXTw2giSwOmAiT/8sSj5FyE+yihN4j4FBY7/ct6IrCDPQSAszkqmnIs1F mqMV+QXk+6SKqilPwZVjGBKcaN2Pj+k4BOjceQQyjMPJ6OAcjblJ7vCzU7chrhLgYeag iJjZDL8MzgWK6orcMjgUacYMqnZSfChUnSVZTG3WF5ms6Ev8zWlOcPHYssUmryqz94u2 /DLA== 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 s195-v6si13581926pgs.492.2018.08.21.14.56.02; Tue, 21 Aug 2018 14:56:02 -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 S1727958AbeHVBRz (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:55 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:34992 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726755AbeHVBRZ (ORCPT ); Tue, 21 Aug 2018 21:17:25 -0400 Received: by mail-oi0-f67.google.com with SMTP id m11-v6so34828685oic.2; Tue, 21 Aug 2018 14:55:30 -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=96bgZeDJu8lmzLzGQEjyQG1f1/HFZ+sSY2PjMNDbDoY=; b=YtJpnrICImw/anir2wNfaUrYGmyEvWecitpkr5EGNFQDirwwjHHprEimeAjbc5RE9D NxRkRX7RrOXhl7I37IK9jppFnQ/35s+8EnG0U7Dbrr1BPlG3Q93uRIap66zbuKGETi+E HNdXuzSEJGNWisbdjsmhG+3ecFiiJ3IlRtCeguOsdv4xJpgOoeHUrtVXHFV4vzuBsfdo 8+i5p06Cv5ofNDxNlQ7BR1FTWIuwjhAjv18/gJzlieiYbKDq7zqn7O5AawqUxLOMckI/ HPa/85z5U1FqfnCCmzWv25kRcByJGQWm8ei5xNv9KnU5FyF7ANnCeU5ifAq8/oEaq+km Hltw== X-Gm-Message-State: APzg51DE7dZN3eYa0bmnrNI+opJrAwYtEKkgtt3MY+kggseXG73dfXgM RCEW6DwH6FBRRnC6CFSBoj53IPM= X-Received: by 2002:aca:401:: with SMTP id 1-v6mr1152011oie.28.1534888530309; Tue, 21 Aug 2018 14:55:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:29 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH 4/8] nios2: fix building all dtbs Date: Tue, 21 Aug 2018 16:55:20 -0500 Message-Id: <20180821215524.23040-5-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 nios2 has a 'dtbs' target, but nothing is added to 'dtb-*' targets and no dtbs were getting built. This enables building all the dts files in arch/nios2/boot/dts/ when COMPILE_TEST and OF_ALL_DTBS are enabled. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Rob Herring --- arch/nios2/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.1 diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile index f6358e395b25..a91a0b09be63 100644 --- a/arch/nios2/boot/dts/Makefile +++ b/arch/nios2/boot/dts/Makefile @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := $(patsubst "%.dts",%.dtb.o,$(CONFIG_NIOS2_DTB_SOURCE)) + +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) From patchwork Tue Aug 21 21:55:22 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: 144786 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51384ljw; Tue, 21 Aug 2018 14:55:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYeTzRaf5SaUI3GIMKArwIsNUnPHFGkCa7IidVU63QZ9rbe0V0Wz8hjc+Ji1TDIijd+EWIy X-Received: by 2002:a17:902:145:: with SMTP id 63-v6mr1129650plb.103.1534888546317; Tue, 21 Aug 2018 14:55:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888546; cv=none; d=google.com; s=arc-20160816; b=s8rORD83ALuBkh8Xq93r9xPqFM9VKwaC5D2IsJe+Pzz3InYSC54ItqWiQwtokL6+lC ghxFV9ukM23a7ZPrnL6nNCC/rZ19ypJ7ADKE+ruaRxY/6xyzRqEO4oYPqM5V49c0zaKj Jk4OSZp4OpsjAHuimc8IPLpQZJ8cQwDbpg4qDrt4Dr+fTU9O2/+bGMBKMY36JevKrKiS GCsHxhKmcjCEEGeI6iACHelPfSkIskNxzieoweS/evhI5njgZU6gpSnwmtnXC2sUslgI ycCSB/XqZqQqzINo6kR+Qu5POpE6E2KaX7/CdZgw7gSykTcSo2rov7YrhzjaU2IwiVKN Kidg== 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=AVcTg7Ld6FXBiGx9e3SJwEPZeCF7UcEHxqTE7BUEsPE=; b=P8Vwtt1QIbWiE5i6wJnpYHc867Xi5YPTi02vEiMs0MDobPapLZVHt/xbJKM4D52jL+ i1A1yTewVxl+JvlUy2+S0c7klinwGdM/L5Oeb0LVcKQQ/81uf7HsPe23u7RVQBdwNIXF N7ScLbcS1qdQ1qzIeSEJS0BKEIuxOGstP8bEVGzq3QyRON+LtAMvdYGGB14BeH2eHO3L 6WqW3Zk8BJH6KGmDQVAdz2pwYWb6zM5yzclAa5hoz1hnTE/c3bzlylKXqWWY/m/2+APo qdLuzsOtpzIW3cpXz7Fa8mNIlWyQQ3aLA+gcBCZWUtbwUpcxL8GP/00oq4a7p40ajRuV 8UlA== 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 k13-v6si11872659pgs.577.2018.08.21.14.55.45; Tue, 21 Aug 2018 14:55:46 -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 S1727836AbeHVBRa (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:30 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:37738 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbeHVBR2 (ORCPT ); Tue, 21 Aug 2018 21:17:28 -0400 Received: by mail-oi0-f65.google.com with SMTP id p84-v6so454090oic.4; Tue, 21 Aug 2018 14:55:33 -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=AVcTg7Ld6FXBiGx9e3SJwEPZeCF7UcEHxqTE7BUEsPE=; b=hKo+Ra69OHYNkm7Bk8NQcPqdVYfbI07X+NoLm9A/iW15r72hvYiFWja93m8NzwhGff OWmgTe3pcbxq0f+479ifmfS2rOm4NLQ02xTgxQ+O1/B5aTU2y47hTctZK2el6iwWMUA9 ChseJExkMKyLyNwFjGK92adNIwE/wQC5NQfydd0LUmr8he2cVPBdm/ON7HpS9WEBlhXh QJwChaYMCe/22/OYz3jtafM8/3Vqna2xnJvmreHukRrkbw+PQPe6GWZWIObiOqhF6IjM pgkEtKy5Cals0+4oJqr+jM/0U1WFxqtigAQfn+8C2ynfwBfZdRAuVjOa53ywbhBantKU +1CA== X-Gm-Message-State: APzg51DHoP/jAkLfQbpq3Tid1IwzT6niRJVx/GmacoCELyQg0ErlJ0yz ubCeTdtemvNIqcqDbHN2nHx0tfQ= X-Received: by 2002:aca:f409:: with SMTP id s9-v6mr1142924oih.102.1534888532959; Tue, 21 Aug 2018 14:55:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:32 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Masahiro Yamada , Michal Marek , Vineet Gupta , Russell King , Catalin Marinas , Will Deacon , Yoshinori Sato , Michal Simek , Ralf Baechle , Paul Burton , James Hogan , Ley Foon Tan , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Chris Zankel , Max Filippov , linux-kbuild@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, uclinux-h8-devel@lists.sourceforge.jp, linux-mips@linux-mips.org, nios2-dev@lists.rocketboards.org, linuxppc-dev@lists.ozlabs.org, linux-xtensa@linux-xtensa.org Subject: [PATCH 6/8] kbuild: consolidate Devicetree dtb build rules Date: Tue, 21 Aug 2018 16:55:22 -0500 Message-Id: <20180821215524.23040-7-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 There is nothing arch specific about building dtb files other than their location under /arch/*/boot/dts/. Keeping each arch aligned is a pain. The dependencies and supported targets are all slightly different. Also, a cross-compiler for each arch is needed, but really the host compiler preprocessor is perfectly fine for building dtbs. Move the build rules to a common location and remove the arch specific ones. This is done in a single step to avoid warnings about overriding rules. The build dependencies had been a mixture of 'scripts' and/or 'prepare'. These pull in several dependencies some of which need a target compiler (specifically devicetable-offsets.h) and aren't needed to build dtbs. All that is really needed is dtc, so adjust the dependencies to only be dtc. This change enables support 'dtbs_install' on some arches which were missing the target. Cc: Masahiro Yamada Cc: Michal Marek Cc: Vineet Gupta Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Yoshinori Sato Cc: Michal Simek Cc: Ralf Baechle Cc: Paul Burton Cc: James Hogan Cc: Ley Foon Tan Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Chris Zankel Cc: Max Filippov Cc: linux-kbuild@vger.kernel.org Cc: linux-snps-arc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: uclinux-h8-devel@lists.sourceforge.jp Cc: linux-mips@linux-mips.org Cc: nios2-dev@lists.rocketboards.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-xtensa@linux-xtensa.org Signed-off-by: Rob Herring --- Makefile | 30 ++++++++++++++++++++++++++++++ arch/arc/Makefile | 6 ------ arch/arm/Makefile | 20 +------------------- arch/arm64/Makefile | 17 +---------------- arch/c6x/Makefile | 2 -- arch/h8300/Makefile | 11 +---------- arch/microblaze/Makefile | 4 +--- arch/mips/Makefile | 15 +-------------- arch/nds32/Makefile | 2 +- arch/nios2/Makefile | 7 ------- arch/nios2/boot/Makefile | 4 ---- arch/powerpc/Makefile | 3 --- arch/xtensa/Makefile | 12 +----------- scripts/Makefile | 1 - scripts/Makefile.lib | 2 +- 15 files changed, 38 insertions(+), 98 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index c13f8b85ba60..6d89e673f192 100644 --- a/Makefile +++ b/Makefile @@ -1212,6 +1212,30 @@ kselftest-merge: $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig +# --------------------------------------------------------------------------- +# Devicetree files + +dtstree := $(wildcard arch/$(SRCARCH)/boot/dts) + +ifdef CONFIG_OF_EARLY_FLATTREE + +%.dtb %.dtb.S %.dtb.o: | dtc + $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ + +PHONY += dtbs +dtbs: | dtc + $(Q)$(MAKE) $(build)=$(dtstree) + +dtbs_install: dtbs + $(Q)$(MAKE) $(dtbinst)=$(dtstree) + +all: dtbs + +dtc: + $(Q)$(MAKE) $(build)=scripts/dtc + +endif + # --------------------------------------------------------------------------- # Modules @@ -1425,6 +1449,12 @@ help: @echo ' kselftest-merge - Merge all the config dependencies of kselftest to existing' @echo ' .config.' @echo '' + @$(if $(dtstree), \ + echo 'Devicetree:'; \ + echo '* dtbs - Build device tree blobs for enabled boards'; \ + echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)'; \ + echo '') + @echo 'Userspace tools targets:' @echo ' use "make tools/help"' @echo ' or "cd tools; make help"' diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 6c1b20dd76ad..cbfb7a16b570 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -132,11 +132,5 @@ boot_targets += uImage uImage.bin uImage.gz $(boot_targets): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -%.dtb %.dtb.S %.dtb.o: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ - -dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts - archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e7d703d8fac3..7f02ef8dfdb2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -308,12 +308,7 @@ else KBUILD_IMAGE := $(boot)/zImage endif -# Build the DT binary blobs if we have OF configured -ifeq ($(CONFIG_USE_OF),y) -KBUILD_DTBS := dtbs -endif - -all: $(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS) +all: $(notdir $(KBUILD_IMAGE)) archheaders: @@ -340,17 +335,6 @@ $(BOOT_TARGETS): vmlinux $(INSTALL_TARGETS): $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ -%.dtb: | scripts - $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ - -PHONY += dtbs dtbs_install - -dtbs: prepare scripts - $(Q)$(MAKE) $(build)=$(boot)/dts - -dtbs_install: - $(Q)$(MAKE) $(dtbinst)=$(boot)/dts - PHONY += vdso_install vdso_install: ifeq ($(CONFIG_VDSO),y) @@ -372,8 +356,6 @@ define archhelp echo ' uImage - U-Boot wrapped zImage' echo ' bootpImage - Combined zImage and initial RAM disk' echo ' (supply initrd image via make variable INITRD=)' - echo '* dtbs - Build device tree blobs for enabled boards' - echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)' echo ' install - Install uncompressed kernel' echo ' zinstall - Install compressed kernel' echo ' uinstall - Install U-Boot wrapped compressed kernel' diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index efe61a2e4b5e..5e7320b2212d 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -113,9 +113,8 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make boot := arch/arm64/boot KBUILD_IMAGE := $(boot)/Image.gz -KBUILD_DTBS := dtbs -all: Image.gz $(KBUILD_DTBS) +all: Image.gz Image: vmlinux @@ -127,17 +126,6 @@ Image.%: Image zinstall install: $(Q)$(MAKE) $(build)=$(boot) $@ -%.dtb: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ - -PHONY += dtbs dtbs_install - -dtbs: prepare scripts - $(Q)$(MAKE) $(build)=$(boot)/dts - -dtbs_install: - $(Q)$(MAKE) $(dtbinst)=$(boot)/dts - PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ @@ -145,7 +133,6 @@ vdso_install: # We use MRPROPER_FILES and CLEAN_FILES now archclean: $(Q)$(MAKE) $(clean)=$(boot) - $(Q)$(MAKE) $(clean)=$(boot)/dts # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since @@ -160,8 +147,6 @@ vdso_prepare: prepare0 define archhelp echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' - echo '* dtbs - Build device tree blobs for enabled boards' - echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)' echo ' install - Install uncompressed kernel' echo ' zinstall - Install compressed kernel' echo ' Install using (your) ~/bin/installkernel or' diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile index 6ab942e6c534..ea4390021384 100644 --- a/arch/c6x/Makefile +++ b/arch/c6x/Makefile @@ -41,9 +41,7 @@ boot := arch/$(ARCH)/boot DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS))) export DTB -ifneq ($(DTB),) core-y += $(boot)/dts/ -endif # With make 3.82 we cannot mix normal and wildcard targets diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile index e1c02ca230cb..b4adab9697c3 100644 --- a/arch/h8300/Makefile +++ b/arch/h8300/Makefile @@ -27,21 +27,12 @@ CROSS_COMPILE := h8300-unknown-linux- endif core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ -ifneq '$(CONFIG_H8300_BUILTIN_DTB)' '""' -core-y += arch/h8300/boot/dts/ -endif +core-y += arch/$(ARCH)/boot/dts/ libs-y += arch/$(ARCH)/lib/ boot := arch/h8300/boot -%.dtb %.dtb.S %.dtb.o: | scripts - $(Q)$(MAKE) $(build)=arch/h8300/boot/dts arch/h8300/boot/dts/$@ - -PHONY += dtbs -dtbs: scripts - $(Q)$(MAKE) $(build)=arch/h8300/boot/dts - archmrproper: archclean: diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index d269dd4b8279..3e58b2317d09 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -65,9 +65,7 @@ boot := arch/microblaze/boot # Are we making a simpleImage. target? If so, crack out the boardname DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS))) -ifneq ($(DTB),) - core-y += $(boot)/dts/ -endif +core-y += $(boot)/dts/ # defines filename extension depending memory management type ifeq ($(CONFIG_MMU),) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 5425df002a6b..8cb5994db05a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -407,18 +407,7 @@ endif CLEAN_FILES += vmlinux.32 vmlinux.64 # device-trees -core-$(CONFIG_BUILTIN_DTB) += arch/mips/boot/dts/ - -%.dtb %.dtb.S %.dtb.o: | scripts - $(Q)$(MAKE) $(build)=arch/mips/boot/dts arch/mips/boot/dts/$@ - -PHONY += dtbs -dtbs: scripts - $(Q)$(MAKE) $(build)=arch/mips/boot/dts - -PHONY += dtbs_install -dtbs_install: - $(Q)$(MAKE) $(dtbinst)=arch/mips/boot/dts +core-y += arch/mips/boot/dts/ archprepare: ifdef CONFIG_MIPS32_N32 @@ -461,8 +450,6 @@ define archhelp echo ' uImage.lzma - U-Boot image (lzma)' echo ' uImage.lzo - U-Boot image (lzo)' echo ' uzImage.bin - U-Boot image (self-extracting)' - echo ' dtbs - Device-tree blobs for enabled boards' - echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)' echo echo ' These will be default as appropriate for a configured platform.' echo diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile index 031c676821ff..4ec91e48ad4e 100644 --- a/arch/nds32/Makefile +++ b/arch/nds32/Makefile @@ -43,7 +43,7 @@ CHECKFLAGS += -D__NDS32_EB__ endif boot := arch/nds32/boot -core-$(BUILTIN_DTB) += $(boot)/dts/ +core-y += $(boot)/dts/ .PHONY: FORCE diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index db2e78fe65c7..52c03e60b114 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -56,12 +56,6 @@ all: vmImage archclean: $(Q)$(MAKE) $(clean)=$(nios2-boot) -%.dtb %.dtb.S %.dtb.o: | scripts - $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(nios2-boot)/dts/$@ - -dtbs: - $(Q)$(MAKE) $(build)=$(nios2-boot)/dts - $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ @@ -74,5 +68,4 @@ define archhelp echo ' (your) ~/bin/$(INSTALLKERNEL) or' echo ' (distribution) /sbin/$(INSTALLKERNEL) or' echo ' install to $$(INSTALL_PATH)' - echo ' dtbs - Build device tree blobs for enabled boards' endef diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 0b48f1bf086d..37dfc7e584bc 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile @@ -31,9 +31,5 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ -targets += $(dtb-y) - -$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) - install: sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9bacffa3b72e..b5845146451b 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -293,9 +293,6 @@ $(BOOT_TARGETS2): vmlinux bootwrapper_install: $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@) -%.dtb: scripts - $(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 # and the second argument as a space separated list of .config files to merge, diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 3a934b72a272..2c1b20cf75c2 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -84,28 +84,18 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) head-y := arch/xtensa/kernel/head.o core-y += arch/xtensa/kernel/ arch/xtensa/mm/ core-y += $(buildvar) $(buildplf) +core-y += arch/xtensa/boot/dts/ libs-y += arch/xtensa/lib/ $(LIBGCC) drivers-$(CONFIG_OPROFILE) += arch/xtensa/oprofile/ -ifneq ($(CONFIG_BUILTIN_DTB),"") -core-$(CONFIG_OF) += arch/xtensa/boot/dts/ -endif - boot := arch/xtensa/boot all Image zImage uImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ -%.dtb: - $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ - -dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts - define archhelp @echo '* Image - Kernel ELF image with reset vector' @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' @echo '* uImage - U-Boot wrapped image' - @echo ' dtbs - Build device tree blobs for enabled boards' endef diff --git a/scripts/Makefile b/scripts/Makefile index 61affa300d25..a716a6b10954 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-y += mod subdir-$(CONFIG_SECURITY_SELINUX) += selinux -subdir-$(CONFIG_DTC) += dtc subdir-$(CONFIG_GDB_SCRIPTS) += gdb # Let clean descend into subdirs diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index df0fff252619..9f619f54bc90 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -283,7 +283,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ - $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -O dtb -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ From patchwork Tue Aug 21 21:55:23 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: 144787 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51458ljw; Tue, 21 Aug 2018 14:55:52 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyFL4q+wnU65xZeOFdXAp6AILpnPCEA+L7/xrAs2HqnprkXIdjMTHXaUBttH3AbjJa4vdNU X-Received: by 2002:a17:902:9a48:: with SMTP id x8-v6mr23508141plv.72.1534888552458; Tue, 21 Aug 2018 14:55:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888552; cv=none; d=google.com; s=arc-20160816; b=VewhCFadfkpy/hCtEAke4WHJIuSr40/UE4pNRV7gNdrQfC/x+AeftIwDVIJZGeumjy M6IXJweESOaw7ZmbWqnDWpaccAE7aXamiXirdA07oWQrzCYIVhx3CVOcFaQmPm332RTQ CQzc1OdSeUG9phENHc+lk1idQCiHTCJnVrJOAJdEYArVO1bQEGxBDm5HzLh0lxtuIotA O58ItH+GSimrBkpc5Dq/tyHCpTZ6BLdzSvk8Bl/bcMonbMuuZclYeCU7NgUdNfQ0tHfY 5f0bhOQzpXAv2aCgs5oy/z9j5Ys5P1hbZaTYnbrB7sMTjgazeWDAVIVLb+Wrj4OPA6LU 8ZtA== 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=bfCjKvj/Rt0QdLyRoM+SklnSQ45TvYZysCa41HzJYLU=; b=cHDMpeiJ9XJN4sa6NkPxYWT4nayEmx6t3oK3lwcgs6C09vJqFasrqM7MAXgs7oZGF5 1yE5U0dbzJZGGNuVSgCe2AracjY77on3abhMX8TizFASa3+Cah6ITqwjrJ1OHvFT4zAn 691cj1psFYx9192Khg0h8J1nUXTLIMj36Y3jKn+fejgXXG/9S1If8QyMbZYixOGI+zIW 77BA7kKJSJyqpjx8iYQtCe9+t5fB6d4h94h2Tjfno341GwcNO/bxX0ATO8IfPB6CUAKs y2B5L1gqZyuyklX3NLIrSHBbnrz2afA2alEhJjiSH5HM76VxBLbDD1P1xtcPaBoy7OeN 6Stg== 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 u6-v6si13126558pld.256.2018.08.21.14.55.52; Tue, 21 Aug 2018 14:55:52 -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 S1727882AbeHVBRp (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:45 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:36058 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727027AbeHVBR3 (ORCPT ); Tue, 21 Aug 2018 21:17:29 -0400 Received: by mail-oi0-f67.google.com with SMTP id n21-v6so34806618oig.3; Tue, 21 Aug 2018 14:55:34 -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=bfCjKvj/Rt0QdLyRoM+SklnSQ45TvYZysCa41HzJYLU=; b=ITSFSkIY5sUaxK6RGb5xKcrK7GpQ0cRaPIgp7XVRLULLJ8RKTmg3R8qxAITC/AR0dn 8D+DdP0mmYQ4AssdmF5BlUXMhsv6/uA5oeQKrixh1eYJnb7GjZdp49udzTn1oAayHmcl k7rDI/wuNa9nLufyfKlLC7sL79Wv/A1sqvxuQeK7t887xus2121TfVR+AKwbPspzttV7 UWUr8K12sQQt1AfMdSzoknW+ZFeU72FkaITxNwLLI8qQjIP6t2NWy5n1W4mfEBNJH6tR BI4OpjCAUMrRa4PQdzUTjicku7NhH7Q0DzebGRbMdhgX03zQHaMRuypGCClW8NhkGkzj 4WeQ== X-Gm-Message-State: APzg51AdLiC8eICh681fKsleNV+ASQivTgvIBtUhGT+cv/X6SYIYIf2t 615EiO2vsUqJDUZPoZ0U8wj4I60= X-Received: by 2002:aca:c141:: with SMTP id r62-v6mr1251510oif.179.1534888533852; Tue, 21 Aug 2018 14:55:33 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:33 -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 7/8] powerpc: enable building all dtbs Date: Tue, 21 Aug 2018 16:55:23 -0500 Message-Id: <20180821215524.23040-8-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 Enable the 'dtbs' target for powerpc. This allows building all the dts files in arch/powerpc/boot/dts/ when COMPILE_TEST and OF_ALL_DTBS are enabled. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring --- arch/powerpc/boot/dts/Makefile | 5 +++++ arch/powerpc/boot/dts/fsl/Makefile | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 arch/powerpc/boot/dts/fsl/Makefile -- 2.17.1 diff --git a/arch/powerpc/boot/dts/Makefile b/arch/powerpc/boot/dts/Makefile index f66554cd5c45..fb335d05aae8 100644 --- a/arch/powerpc/boot/dts/Makefile +++ b/arch/powerpc/boot/dts/Makefile @@ -1 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 + +subdir-y += fsl + +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) diff --git a/arch/powerpc/boot/dts/fsl/Makefile b/arch/powerpc/boot/dts/fsl/Makefile new file mode 100644 index 000000000000..3bae982641e9 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) From patchwork Tue Aug 21 21:55:24 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: 144785 Delivered-To: patch@linaro.org Received: by 2002:a2e:164a:0:0:0:0:0 with SMTP id 10-v6csp51292ljw; Tue, 21 Aug 2018 14:55:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy2fYD40XAZIWLoMSjO0n5D35P1LTth55J4KmAu91hC+FzOpIifRcoM9Fi6eht5OX12mZHf X-Received: by 2002:a17:902:8481:: with SMTP id c1-v6mr51723467plo.177.1534888539854; Tue, 21 Aug 2018 14:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534888539; cv=none; d=google.com; s=arc-20160816; b=EiPNAF4qv6ssT9taBOnU7pWDRDsaE8sFHPgFlyU1SkS4E36Gl66sh3kPv9niNbuhnJ ybLlJIUq5IPK/Lq7DC9e8nxKPW8pJiCUtJt3KOhLKr+fvZQ6YaWGuiLsiKPXobMx2JbB Ii7SkifPcGc/a4OgaUm2jlZxaGgqV4R76VYs/PVj/KZR8WRfBTNGChvWYBbjiGJXlFrc BhdOIfmZmyX5o8BmASaUJmzzmwn/Qhr7rz8mANMY498fch0krKFcclVcRhfj76FtdLYk ld0pXXAQNpJr14kAMjFdqZ3edw+qo2hnkEoJVeypKmHlzxjft+LQA2zIBJZk2OFfweyp EYJA== 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=DYdoq36w44tbxiz7aQnu4a0/sdA1BLlXIXWES4KJFKs=; b=sXiaDs2YYQ6auF7UhqiGKHZprlLk0iEuzUy/ZrCnOIapgA7u0nyXNhON8ATN/xUkYc HhA1/uXDiXd1YfpzEiQrvwXNIhflI/14U5ZrTZpHs6LW445SVwLOWTZi6UyoVkIJrGAh lmOSrl5s27pq9Gz8TZoRldJHR23l8go9X5+Qr/GAAnAnmtpAyZp7VWV/Chh13JQ6Slj3 LL3cCKorhnnHBA9oM9fRFcWZ/tXc9NWJmupe5q5MRnFVsHVoCFPZW/xF3m3P7dpxu2pZ nX1iDBG140UCxrxpcYfznqqIfT1J3k+d2WZipUR907Cpw3H4Bg2XQm3n9KfqQsXDXBlF EP8w== 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 j23-v6si7371283pgn.139.2018.08.21.14.55.39; Tue, 21 Aug 2018 14:55:39 -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 S1727856AbeHVBRb (ORCPT + 32 others); Tue, 21 Aug 2018 21:17:31 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:35005 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727815AbeHVBRa (ORCPT ); Tue, 21 Aug 2018 21:17:30 -0400 Received: by mail-oi0-f67.google.com with SMTP id m11-v6so34828994oic.2; Tue, 21 Aug 2018 14:55:35 -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=DYdoq36w44tbxiz7aQnu4a0/sdA1BLlXIXWES4KJFKs=; b=QJPLxS9uNxPMDOOP0zuifECM+ztKib85tnuehwgFm25uMoxEMoPuLExD5LeX5ubg56 GNfWHELl6v2El6Q7WLyFKh6MVwOdJ0RlH542BEA5GRO5Z8EhEq4GahCbPRMIiWbMM+PI wQUPyQxPkW4Cij2ZxO0Ig3oVo/it84zfLWKC02sBrglpVM68shr43mNHGkqlGkkn0xAT vOnvyoWJn/udoPkiWZeV2RSnqY1iLROcFYaHCv4M0XAa9M522b6MaogDixPTQ0OqL5D8 t/0/j1FEfvDfa/6HGgEQzbOwhU/CX4OO2BowjK1l1FiN2e9exTD3z+XUjw0O7OoX28Xw goIQ== X-Gm-Message-State: APzg51DVGowtn/MvPvg7ICSmszby1PcZaoAxmat3ea4Cdj2onO4PhFyr goqw+L+WpQhUICLD2Z6hnv50rRE= X-Received: by 2002:aca:d986:: with SMTP id q128-v6mr1117459oig.349.1534888534749; Tue, 21 Aug 2018 14:55:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 14:55:34 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH 8/8] c6x: enable building all dtbs Date: Tue, 21 Aug 2018 16:55:24 -0500 Message-Id: <20180821215524.23040-9-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 Enable the 'dtbs' target for c6x. This allows building all the dts files in arch/powerpc/boot/dts/ for enabled platforms or when COMPILE_TEST and OF_ALL_DTBS are enabled. Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Signed-off-by: Rob Herring --- arch/c6x/boot/dts/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.17.1 diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile index fd937f781d16..f438285c3640 100644 --- a/arch/c6x/boot/dts/Makefile +++ b/arch/c6x/boot/dts/Makefile @@ -5,6 +5,12 @@ DTC_FLAGS ?= -p 1024 +dtb-$(CONFIG_SOC_TMS320C6455) += dsk6455.dtb +dtb-$(CONFIG_SOC_TMS320C6457) += evmc6457.dtb +dtb-$(CONFIG_SOC_TMS320C6472) += evmc6472.dtb +dtb-$(CONFIG_SOC_TMS320C6474) += evmc6474.dtb +dtb-$(CONFIG_SOC_TMS320C6678) += evmc6678.dtb + ifneq ($(DTB),) obj-y += $(DTB).dtb.o endif