From patchwork Wed Sep 5 23:53:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146053 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104384ljw; Wed, 5 Sep 2018 16:53:49 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZQjH5SYQCs8sHiM20sO5xhE0dsUDlmvShCmM/TvXw+B/fQEkQh09veBELwXWcADUmBI8PM X-Received: by 2002:a63:fd52:: with SMTP id m18-v6mr135865pgj.304.1536191629648; Wed, 05 Sep 2018 16:53:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191629; cv=none; d=google.com; s=arc-20160816; b=bkkI3KcGSe0N6vNRVReS+eREOXGwSMdZro44D03r53oUGjy9343yi8OOlt1BlA944f N4/cONSc6ADAmFEt0bt2ci3iNc3DM9/u0RcX06UqQ+a0os70cpfeRTCNMcixXXl2fYrN 8XykU3XZsxBvxiyMmDY+CrWWxRNhtC+weOmdrXpjzpsacAXUF83SrBVMFAv7XDXjjakA DJc3tXVVvFjdBy8o221JnHgCP0rhzdNtAkEpEFEZxVoM1OgHtw1NjRssBX3oYe2+psVE ldFTbD2+at/5Y3dM/lTZVrQ8kKT9iJ+2fMT/iJfjMUClWBA+eoM7jc2k7yvpMnlpy0Xb 4rlQ== 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=IMXV4BrLUnHreRSVouV+RzNcdCX3xRFRfEwzX4J4BRQ=; b=bwjmSUxo47AOXl8b5Qvy6qmtwQJ5qHKMleoTR9l+5yNY915COLE7ww3pkJg+tsNbFH uD1Otl9Y7l0SRDgQ2pWuCpnUE5j/VtXOi6tMjp1XAOw1nf4p9SlE5RnV8YekmZaCjhIp Vyf93b++6c55IodfgjgPR0BXqwXxh04KNrDiGC4Q14/IToQ+hhG7IjMxdmNVyOtSG1a3 VFgSXB3J8c8doooC3GQzzjke9/ZiNc0pgLf7WezmFlmopWOHepuSApBQ6UBvRtDqsZ2p bzZlT1cjGaNmr9IDgvBemQlu3l79Wd4oxfzJNmxekFSOFsZB9iq9POQZweEPpndImJ+3 3l9g== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.44; Wed, 05 Sep 2018 16:53:49 -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 S1726337AbeIFE0E (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:04 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:41205 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725957AbeIFE0D (ORCPT ); Thu, 6 Sep 2018 00:26:03 -0400 Received: by mail-oi0-f65.google.com with SMTP id k12-v6so17090436oiw.8; Wed, 05 Sep 2018 16:53:31 -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=IMXV4BrLUnHreRSVouV+RzNcdCX3xRFRfEwzX4J4BRQ=; b=LtwPxo5kRvn6WldC6s3T9a5+9chdZ4w8xpFDC3/1RJTDVI+TdE0duLX4iFkb2UTPem lJkBKb2E9qP47cxaf3ereXD7ZI+1NlTcI5C95L4bgYiQUu48qTekXihYd4924tFZKmzx aEv7LXgeQAThOzY2zhLKmWqFwexjsUkSM46VLhuTZP6bC5NU/9IP8aDmt7ME18UODFO0 XtWUVBfuOlTDBVmnnxN5/2jVMQUKT/yD3itp/IInzyUqjpiqK1F+UsSne3rFgVEz0mTL trE3czQZyB1//cLWg2D6wSOo/suc5kRhlT8ytObr4isyxKDEkdoCJVKio8WmYgbuPETu 3wQQ== X-Gm-Message-State: APzg51CIjvf1o/WZ4jWxsL73kgRRkUkX75s8bHUqoGZv07YJE/rA8AUu Ie+s2rI1oZ7+NH9udSTq13014V8= X-Received: by 2002:aca:6c4f:: with SMTP id h76-v6mr138064oic.214.1536191610773; Wed, 05 Sep 2018 16:53: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 h186-v6sm3860624oib.55.2018.09.05.16.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:30 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 1/9] powerpc: build .dtb files in dts directory Date: Wed, 5 Sep 2018 18:53:19 -0500 Message-Id: <20180905235327.5996-2-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 --- Please ack so I can take the whole series via the DT tree. 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 11a1acba164a..53ea887eb34e 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 Wed Sep 5 23:53:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146054 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104390ljw; Wed, 5 Sep 2018 16:53:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaXYf+7fNuyIabouUJ4U/se2yu74mEv9JFgkn7gVjmoIZKCpn3k64trQh35sN13YlnLKOZo X-Received: by 2002:a62:e008:: with SMTP id f8-v6mr138960pfh.208.1536191629991; Wed, 05 Sep 2018 16:53:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191629; cv=none; d=google.com; s=arc-20160816; b=0og3Lxk2D3h2/H0dSV2Vad3UGQoK/r2C6v2vp2LB4l7XhVAVKJ8ZuyLlw9VeiFpkmV w1RjjJUoQcDk3736eMyR+dCVIH7lTRP8xMgula606iC4/E5EDRj+49YkFYYi2qEd3oR+ jt/neEf+O4XE/SANrS7DjQS3CpGnaauTz6HNicLJk8olpvQbdAGgwya0Pcil9SYgQbZV R25v7HQ0txFICEEJTtauAXiYVi+n6Ja3q+y6rSkFjBxjCGiVC44twRsGwkrqrsfpj+Hh Y86e4k+r7VYM4LmO7la+AangBycHCxs6DmRXuTsa5Qvc9oPEgYC/Eex2HurV+evedmmn Qf+g== 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=536qjisqbzf15CCnT+KJXbmbrcg6Ws7yKjBosjpRz50=; b=aqPbcjmm/Rvu8GLBj952BIW8dgZ/qVz6KaadC78zwAwLlO6NYxuYMTC6TxDCCuCkHF dSXasfCu+Y//FTur95xnEqKqAOQt99pYiuYkO7r1S9BtEEe+ZA2OKxSgi2nB6PGIZZS4 Qu3kye/oYDye70PYfZEhzf/T/oSs2w/aNEn4f/vYk8iQKFgfuyAOuPOKvMsprLa/eq4M ah5NM+9e9atrlMI2XOJ6o1SwF8d74wvw0oXJr16j6exQxU5PEJBDKWfil9+xzysGVGSq 0aQBojsITqBL7sLH1go5//dmC/jiS+g07DsMwr/Be/8MPSGhnqw4fLnqaqYkBzsfDq6K 1+SQ== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.49; Wed, 05 Sep 2018 16:53:49 -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 S1726404AbeIFE0F (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:05 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:37648 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725804AbeIFE0E (ORCPT ); Thu, 6 Sep 2018 00:26:04 -0400 Received: by mail-oi0-f66.google.com with SMTP id p84-v6so17149781oic.4; Wed, 05 Sep 2018 16:53:32 -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=536qjisqbzf15CCnT+KJXbmbrcg6Ws7yKjBosjpRz50=; b=GWfpAX6iL0JFt+jkqJt3+C9VZE3B34ERc7JwRYR4T+cPd08nNgZbBTDxwujr3fN3RL ghCF0mnyyXEBZmsLhoqviIHHlBbx9lvV3/ZSP7eeMx0Zd8HbIXdtU1Fvv6oIpH9JfiyG 2wITndv4PH3vtBQvNH74FzwIbf5UFa2qjZdc/UqoifR6OmIRnRmzvujpOEd3EslAS0/S TGVHYey0j8F0C5WgmReyBKUJr1tLV8kekRZiicpwwlJPS+UVybiO4SnVm6qrzhOEOfTW 7ET+gf3uixisMSdr2BWBtc1YvAqSgb+Uh5zN3TiFkOQvGyZozKDbLukakdysyio+X1QT bZcA== X-Gm-Message-State: APzg51D1oYJBUT4F4Qg8rPDFFrf6L20PCFGhs/1Ybwj5i8h8Y0G3ohP8 gE0lnvGVkDcTzn4osDJSO5v+G0I= X-Received: by 2002:aca:2c02:: with SMTP id s2-v6mr100787ois.305.1536191611793; Wed, 05 Sep 2018 16:53:31 -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 h186-v6sm3860624oib.55.2018.09.05.16.53.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:31 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v2 2/9] nios2: build .dtb files in dts directory Date: Wed, 5 Sep 2018 18:53:20 -0500 Message-Id: <20180905235327.5996-3-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 --- Please ack so I can take the whole series via the DT tree. 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 From patchwork Wed Sep 5 23:53:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146055 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104404ljw; Wed, 5 Sep 2018 16:53:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaUURE8b1FN2GkbQ4N+MeTEWnTDTPTcb7uKpcyn/cFLs6J0xZXZe83uMB4Fk24iv7T5wvUg X-Received: by 2002:a63:ee15:: with SMTP id e21-v6mr84985pgi.421.1536191630732; Wed, 05 Sep 2018 16:53:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191630; cv=none; d=google.com; s=arc-20160816; b=pqCmSZTZ5uxXE9nFY8ZIi/LLW5WvU6w8fmFL3nboiwRPR/SYLA/Ynn8HmssmPnqWyr s05aAf8MQJviJK6K986CGp70aMXV2XRzHJQ9xv2ZFHvQDM1hP2YxzJeZZafKSfKqMnLK udkhyDBHahC3fHFHsMGrPuvJBO8Fpj/Q7Ijg73onnqLv3jDWvX5ekGrl5ILHFoIaFTof 1DKpM0DB82WzVx0fiSl7RZI6ndsTTSBYmmUl9LAnlNvnub7dA/4sivHgqPkPUzEp5nMB upZlRFF43Eb9gj0+UH59r+9f2Bwy6fv9h5yyoV2t87eJvxKSlESILThCHcWZ+jletJ/B g77A== 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=jjE/jnUmiKPQSmhzhh4e+Dd46t+Pdv/5rhH5PoOndHA=; b=Rmz1BQ7wDJahvhdfDBjii4RDaXLvOTAqq4XkKyC+ymCf1sDTpIiRN3lYbCywuqu1tT I//UIbANpJJqcYI8utOIb17MTFdWn8hQHYEqYW2RsM7su3suwxMmzuU/sPIQv9Ke3kym ATr6VBAuqeBWwg9m9Jh/3azuJ9DulrarHBCx1zinKvY/ZhMa6EojQrNodkN9EIbO1b7v d5+xLQRNidlHTzO3ruWEfCbf1hB2dDOjxM6XzOwl9dXZNpep9f3mgyuhZfDigbtsmN6T DeD4zlLHIeSv7nCSag11pK7nEzX/oNoW4w7HAJtbQul3J9S59eVIVfNROllB8EoGfVHi gutw== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.50; Wed, 05 Sep 2018 16:53:50 -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 S1726650AbeIFE0G (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:06 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:44749 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726425AbeIFE0G (ORCPT ); Thu, 6 Sep 2018 00:26:06 -0400 Received: by mail-oi0-f65.google.com with SMTP id l82-v6so17090283oih.11; Wed, 05 Sep 2018 16:53: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=jjE/jnUmiKPQSmhzhh4e+Dd46t+Pdv/5rhH5PoOndHA=; b=ScExSHV0QOidcxNN3/bMDUYeGpMmbgjJiu/Y/UFy1J9qXCTNBCoUUCpOWv7nFKhVk8 7bLD/lmSEuMckvmqeEx7kjDvvWytC+c14FD9U6L/AMJHq0XTq+FWCFa873JFT5bL5mhr wtBMmKRWOw4+M/V8APXxzubfXuXw9A6e0UYi1frbDRy82jqpIa/8FQUUAiDr5NkAQAKi YCy4L7GU8dYyIMeLYaVRqjUt1sIpjY6iE//81mhWR1FvD3slwAyQw3ozxkYeYKF1Xn8K h/BBF1InH0mm1Z6UIJmEFAUxfPhOWhm2aXHQ0e0K9wdbL7cC8XbAcEhM0xXFJJEBMDBN G0zw== X-Gm-Message-State: APzg51BsKipr4i/mxVO7v8FwaLGi/V5Opfb0ZHPQzHeQQWFbbkaPqpZ8 CxKblpUPc0KFAf2rE6vzA2U96Mc= X-Received: by 2002:aca:aa8d:: with SMTP id t135-v6mr123276oie.218.1536191613633; Wed, 05 Sep 2018 16:53: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 h186-v6sm3860624oib.55.2018.09.05.16.53.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:33 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v2 4/9] nios2: fix building all dtbs Date: Wed, 5 Sep 2018 18:53:22 -0500 Message-Id: <20180905235327.5996-5-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 --- Please ack so I can take the whole series via the DT tree. 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 Wed Sep 5 23:53:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146056 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104409ljw; Wed, 5 Sep 2018 16:53:51 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb9qHGIHnVGBHT+Au/3c0RPRR/GbVfTRZe8fn4aHD2wVCclUA1aBGSSAqzyzSe4mWPazK0k X-Received: by 2002:a63:6054:: with SMTP id u81-v6mr83238pgb.433.1536191631226; Wed, 05 Sep 2018 16:53:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191631; cv=none; d=google.com; s=arc-20160816; b=y0ju1ZN5dWH0vMo1SVVlNuCYcsy1x4Knn8Lkz4FlNcqDbQe/GVlFMUagBaVWlWNNcj DkI3ZaL10EU+SyZvEZmrSqXrC/nP0upG4F3UT+QIBDCvq3nCEgDahIiH9NiXiB40xUX6 bjnr6vwGGtA7FuZv6avZ0DO6/sP8mEpk831KwUhUyPzyr49NfFQJJI0ZN/9Syro6g7yu UJsO5DCrOoQq50aVtTjK6OiFLiKIBSoVR/ZyeNdsYtzJK1qTESHR1Uj9kAyAx+QnAT9s Zlm8xwwir3/CKJs4SoRxic2Bg856TXa5sb0ibgH7OXMcrfDZi9+zPA1SZGcU4E5DRS10 fGZw== 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=6TQUk/tlo44b4q/BoWZVHk3v/GbjgWViAdwLo1tLgLA=; b=bO57BjHdAyawT/bapCY4ekld0nJs0xKyqYYDq5+5gdC2H/dbbna1gJAHp/MbolJ9Rx yO3OOaEBMkC4r8RjQkRI0YaF/OWrIg0u4W+lNJctF8C3ienSY8ovnYA32rqX7S6NM7oE lyxExsOIP6VyEREsaIFHNVAo7GCVqmUDLSPcI40GVlPbheNKV9/OLyvQYqi5wwIXeCPS TScZyKS7oJsppiVTzK04C1mfK6VRhcJJio+H9Ibdg92BpWYA1TSaoLrHQmHaCLF349NL B4J3UpAgudtYz/h+XzFfYBPl6Ngps7Oe5AmYJuWCcGSTO4kjVDku4IjxWtblzkkhd5/B HeVQ== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.50; Wed, 05 Sep 2018 16:53:51 -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 S1727627AbeIFE0I (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:08 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:36557 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726425AbeIFE0H (ORCPT ); Thu, 6 Sep 2018 00:26:07 -0400 Received: by mail-oi0-f67.google.com with SMTP id r69-v6so17144345oie.3; Wed, 05 Sep 2018 16:53: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=6TQUk/tlo44b4q/BoWZVHk3v/GbjgWViAdwLo1tLgLA=; b=HWH58wDaOHxrHbo8wGeZ4CLjdRdfEX+PEQfHfidF6rEglytjfC30451xKBgTCIUayb uLrqxFY8vZT/8ogbhPPehSUn7KAKk9YnVVZaY3TKlaD94pbwIcHUGWSOsi5qRhx0iLTu Zur/EyT6DHQFd3qmh6El8Hnvth0CkbF74J6EkMkRqLIim9HnvG0YYXPTHn336K/GDD5e CghRnY+lfyE09T2CyU4A3h1TbF6YaaQNdlmzT/QSjc+iEebVC+iHF8oUWPTCetrJF6hv b9l/18Zsy/aEujEQJalZe4jIhug0MlLjwMmhqrHDOesmTDD2B6olJFDCEdf2Ig+3XnYz wB1Q== X-Gm-Message-State: APzg51AefYtDOtFJZgsiRRJQUAVfKLN1Z0F0sr82ISuiX3kTqub7iTX4 aVka0zUloA/FEHjn0eGV6Irh5yk= X-Received: by 2002:aca:dbc2:: with SMTP id s185-v6mr102000oig.251.1536191614946; Wed, 05 Sep 2018 16:53: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 h186-v6sm3860624oib.55.2018.09.05.16.53.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:34 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v2 5/9] c6x: use common built-in dtb support Date: Wed, 5 Sep 2018 18:53:23 -0500 Message-Id: <20180905235327.5996-6-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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. The dtb now needs to be copied when unflattened because an init section is used now. Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Signed-off-by: Rob Herring --- Please ack so I can take the whole series via the DT tree. arch/c6x/boot/dts/Makefile | 11 +---------- arch/c6x/boot/dts/linked_dtb.S | 2 -- arch/c6x/include/asm/sections.h | 1 - arch/c6x/kernel/setup.c | 4 ++-- arch/c6x/kernel/vmlinux.lds.S | 10 ---------- 5 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 arch/c6x/boot/dts/linked_dtb.S -- 2.17.1 diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile index b212d278ebc4..fd937f781d16 100644 --- a/arch/c6x/boot/dts/Makefile +++ b/arch/c6x/boot/dts/Makefile @@ -6,14 +6,5 @@ DTC_FLAGS ?= -p 1024 ifneq ($(DTB),) -obj-y += linked_dtb.o +obj-y += $(DTB).dtb.o endif - -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - -# Generate builtin.dtb from $(DTB).dtb -$(obj)/builtin.dtb: $(obj)/$(DTB).dtb - $(call if_changed,cp) - -$(obj)/linked_dtb.o: $(obj)/builtin.dtb diff --git a/arch/c6x/boot/dts/linked_dtb.S b/arch/c6x/boot/dts/linked_dtb.S deleted file mode 100644 index cf347f1d16ce..000000000000 --- a/arch/c6x/boot/dts/linked_dtb.S +++ /dev/null @@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/c6x/boot/dts/builtin.dtb" diff --git a/arch/c6x/include/asm/sections.h b/arch/c6x/include/asm/sections.h index d6c591ab5b7e..dc2f15eb3bde 100644 --- a/arch/c6x/include/asm/sections.h +++ b/arch/c6x/include/asm/sections.h @@ -8,6 +8,5 @@ extern char _vectors_start[]; extern char _vectors_end[]; extern char _data_lma[]; -extern char _fdt_start[], _fdt_end[]; #endif /* _ASM_C6X_SECTIONS_H */ diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 786e36e2f61d..509c5f086496 100644 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c @@ -270,7 +270,7 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size) notrace void __init machine_init(unsigned long dt_ptr) { void *dtb = __va(dt_ptr); - void *fdt = _fdt_start; + void *fdt = __dtb_start; /* interrupts must be masked */ set_creg(IER, 2); @@ -363,7 +363,7 @@ void __init setup_arch(char **cmdline_p) memory_end >> PAGE_SHIFT); memblock_reserve(memory_start, bootmap_size); - unflatten_device_tree(); + unflatten_and_copy_device_tree(); c6x_cache_init(); diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S index 1fba5b421eee..584bab2bace6 100644 --- a/arch/c6x/kernel/vmlinux.lds.S +++ b/arch/c6x/kernel/vmlinux.lds.S @@ -90,16 +90,6 @@ SECTIONS *(.switch) } - . = ALIGN (8) ; - __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) - { - _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ - BYTE(0); /* section always has contents */ - . = _fdt_start + 0x4000; /* Pad up to 16kbyte */ - _fdt_end = . ; - } - _etext = .; /* From patchwork Wed Sep 5 23:53:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146058 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104419ljw; Wed, 5 Sep 2018 16:53:52 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbR0rqwPORzcujPQECIZxJGBTUIZGsFUa6KGSKevE6ii193IWc7RbrQ/Goj1MUqq3gdSJF5 X-Received: by 2002:a63:a053:: with SMTP id u19-v6mr128624pgn.394.1536191632206; Wed, 05 Sep 2018 16:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191632; cv=none; d=google.com; s=arc-20160816; b=u7DIEklacYjGG63b97uAmjjxG3e4KMAinR20QWhW4BBs44UI9E0ko5Bohwo9qnL6g6 nlEpSL/7u3NUTeUOacL+mLg4nQdJpMglPCRpDgiV6O4DparguhSb0xmZ2mt8+7byPUwo LntSvd0XJOcgdUXH2HkDVqVjGX+9ayq/hfmA1/MNQyJo5yKe52/fmkpRb35zo+DBh46X JF4SUSwWalHgfTvawJWSqoqF0+ulm7dUZdyzNcFh05Tkwy+cjIbbInBKkeyd7IWkhuzK q7nlPfFaY48ONMHeNz2rDejwF7APrMc1TivV0Zx2/zwfQjQwkyM+nvhG2/KgjOw/WuNa KzqA== 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=P0zRVAO6zBJ5SnemJx7PUmyeySaJr2uMusE9pIAuuk0=; b=KIWTgt3CjS6tNYcYbY+GEEGN28jaPXkmsC7sxF5JNcjXWSj4Exv6q7B2EtgHd1kGwu KcQRj35mZpO7+xwNZdxeX3VEreT//kHUs8ebZU8x1gwuI3vmTGZmfJqcWw/a0NiA6+PP bNd3/GvJ168oeGgO6YS63lhhD3ZO+TkriOsFEYtwtnmwTQy7TY8+SElA+y/mW9jNIudy zfpFJyuESZlaLKi2w1x0gsCr7SWGeRls1FIluKiBsUtwvdB0KTi/1UbYD2W7hLE9jLw3 C9HFezX/QERE+lcLTISdlZnj16e6ZBWMJsRRUmtcTLdaV6+maHuh2tk4abf4hBJhh5CG mWEQ== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.51; Wed, 05 Sep 2018 16:53: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 S1727698AbeIFE0M (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:12 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:33086 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726425AbeIFE0K (ORCPT ); Thu, 6 Sep 2018 00:26:10 -0400 Received: by mail-oi0-f67.google.com with SMTP id 8-v6so17183733oip.0; Wed, 05 Sep 2018 16:53:37 -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=P0zRVAO6zBJ5SnemJx7PUmyeySaJr2uMusE9pIAuuk0=; b=B0VwfNA0ltxFZsOCRMU5BeK7nqXNTezzXk4drLTuL1TEfIqKozm3VY3coQ8aNEQvOo hx1ldlJRGZQX5L6Mb6w7atoIWDgIkslobZAlFaKYNh2V4m9dcQ281rH9SLt3t9xifKk1 USWp//X9bQI+tL7m8VoywH8V8CPZj2oBtGds7TpWGFGuok1SHrhx9HSR7lXyCcjrsGl2 YBxDkhPIkiPZ3A6hQf2uCTqHhk6bfV6pDeurwdbsL0XHEG9FpfpTyZ9++/VWnPqJokIt yQzDsU+GMEjqJl62Rn4YhPYv2IkSVXJOy5qHqLMHx2JrXxz+LgSW3TrX3/tpF3OqmhFf wlgg== X-Gm-Message-State: APzg51DajootcHSYaT8YhUEErDQPOY4hfk3TM48kuwZy/OeGMatihyeb nSCC+6k5hqnF53n+UADLXqnWx8E= X-Received: by 2002:aca:4e50:: with SMTP id c77-v6mr127253oib.254.1536191616606; Wed, 05 Sep 2018 16:53:36 -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 h186-v6sm3860624oib.55.2018.09.05.16.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:35 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: 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 v2 6/9] kbuild: consolidate Devicetree dtb build rules Date: Wed, 5 Sep 2018 18:53:24 -0500 Message-Id: <20180905235327.5996-7-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 --- Please ack so I can take the whole series via the DT tree. v2: - Fix $arch/boot/dts path check for out of tree builds - Fix dtc dependency for building built-in dtbs - Fix microblaze built-in dtb building Makefile | 32 +++++++++++++++++++++++++++++++ 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/microblaze/boot/dts/Makefile | 2 ++ 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.lib | 2 +- 15 files changed, 42 insertions(+), 97 deletions(-) -- 2.17.1 Acked-by: Will Deacon diff --git a/Makefile b/Makefile index 2b458801ba74..bc18dbbc16c5 100644 --- a/Makefile +++ b/Makefile @@ -1212,6 +1212,32 @@ kselftest-merge: $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig +# --------------------------------------------------------------------------- +# Devicetree files + +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/boot/dts/),) +dtstree := arch/$(SRCARCH)/boot/dts +endif + +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 @@ -1421,6 +1447,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 fb026196aaab..5c7bc6d62f43 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 d1516f85f25d..161c2df6567e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -307,12 +307,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: @@ -339,17 +334,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) @@ -371,8 +355,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 106039d25e2f..b4e994cd3a42 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 3fe8a948e94c..b7aa854f7008 100644 --- a/arch/c6x/Makefile +++ b/arch/c6x/Makefile @@ -40,9 +40,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 58634e6bae92..4003ddc616e1 100644 --- a/arch/h8300/Makefile +++ b/arch/h8300/Makefile @@ -31,21 +31,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 4f3ab5707265..0823d291fbeb 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/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile index 1f77913d404d..fe9af267f598 100644 --- a/arch/microblaze/boot/dts/Makefile +++ b/arch/microblaze/boot/dts/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # +ifneq ($(DTB),) obj-y += linked_dtb.o # Ensure system.dtb exists @@ -11,6 +12,7 @@ ifneq ($(DTB),system) $(obj)/system.dtb: $(obj)/$(DTB).dtb $(call if_changed,cp) endif +endif quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index d74b3742fa5d..d43eeaa6d75b 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 63f4f173e5f4..adcac830d051 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 53ea887eb34e..42f225f6ec93 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 295c120ed099..13fd3301c517 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.lib b/scripts/Makefile.lib index 61e596650ed3..8fe4468f9bda 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 Wed Sep 5 23:53:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146059 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104436ljw; Wed, 5 Sep 2018 16:53:54 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYaJoKPONXuflfsH1C/0c5acy79QvMoHF1x/u9bc0D22SpjxNXyOOqESY2GjxwosywVGSMw X-Received: by 2002:a65:4849:: with SMTP id i9-v6mr127851pgs.350.1536191634141; Wed, 05 Sep 2018 16:53:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191634; cv=none; d=google.com; s=arc-20160816; b=LN/j89nDIM+jtIA9WS+pUZ7DtErOyXZ5EW6CiCINZKGdQW5llZSik73qPI3IqMm8sR o8C8MApIqs3LGfSAEa/e6g49No/NoBu/3t1MsNtQ9DJJ9y2NZiMZPvV03Ihv2OmWjgxn 8QubL6ylI3jgZEzCXff5UAZv8LK/dQETAHGwrY8PVdrpfZk1CrmyV8Qa9F6y1OPt8oxF L7sKmILqBVIFCYc81bApMrU1ouXqvZecwv36dggeMYddCbCes7i/Nrz31XgUC6sJBtWX A9NiEmd5BzCp2/W5xczL8IbdMFMbOhhR5I/zs6qy2q0nr99HY0E13xJThC5e3bfDBliw xwsQ== 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=XtO99ev5ZPrjQnIQO8qkEa/mf4JvNHskYGW2nsqC7Sc=; b=udu9sQOJsZZWDMrX0WDAtULfIW6lEGLaRP71L6KjCGwsjeTpRYayGt+re2rgJP8kXi zEhMakeh8BL6KoMqfeK2ZmOz785s9HfaYNnaX+ISIsRydkCAzm12q/Pn4snLOb1etr5p za7ZkMqm7VS0QedsZWAvpZnTgyBvghXlyo69r3H9iyNmgxPn82SLL8TkHNOFEZJfUHRh DzME05+MmjnfZxj/ewAaN0/BPXle6URm275hcqkVEiDWEVl3nYAkbyO8v01uZdN6TC6c zY/uHERnbT1i4c+5Iv8xPKmGbi4kppHKxfBcjxAXZH1FKep8K33g5/OtpyzjfIvo2HpI ghZg== 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 w68-v6si3465396pfw.308.2018.09.05.16.53.53; Wed, 05 Sep 2018 16:53:54 -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 S1727679AbeIFE0L (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:11 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:33087 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727635AbeIFE0K (ORCPT ); Thu, 6 Sep 2018 00:26:10 -0400 Received: by mail-oi0-f66.google.com with SMTP id 8-v6so17183779oip.0; Wed, 05 Sep 2018 16:53:38 -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=XtO99ev5ZPrjQnIQO8qkEa/mf4JvNHskYGW2nsqC7Sc=; b=offPPfX5+5tRw8iJsk0lK7cmJJqv2Ba+3HtKBWUWhm1fR3LCiBsPFLQHNogRsAD1Ct 840XmBkZXAl01oFbXalInlnii++Ei00lR7rMZf+euN4DWhilejC7hpRYJU00FHR4UThv W+gspS7ar4kYqsmQkCDnH8iAqRCVpyZsmGV08Pn8OvpgtukZ/dpM8OTxaLPTHncRfh3y gNRJQ9nS204bXcasSZgYJLEjjtzpqY1HxfcuiwI26XEij7r9gWvryy3OS5qHLvCxUSIg uIDynQi/HFcUjsv340LCDd4O8SL0x2cha4TQDBQDPd0N8VDNamWCAHQf/92o31AeeadC q8kA== X-Gm-Message-State: APzg51CFNvlt08hOzBthHWdkqQgvRS9OMVUUlLPgWQrNeAhp/rqmdIg1 paEcwvTmE9jeMOHOZyW5QCjrkDQ= X-Received: by 2002:aca:3606:: with SMTP id d6-v6mr99007oia.327.1536191617539; Wed, 05 Sep 2018 16:53:37 -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 h186-v6sm3860624oib.55.2018.09.05.16.53.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:36 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 7/9] powerpc: enable building all dtbs Date: Wed, 5 Sep 2018 18:53:25 -0500 Message-Id: <20180905235327.5996-8-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 --- Please ack so I can take the whole series via the DT tree. 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 Wed Sep 5 23:53:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146060 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104502ljw; Wed, 5 Sep 2018 16:54:00 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaE/CKmcvAEliZ+QMp3h9kYKUfsCsAX3K/ldixMND8N19I6ateROpweCUREKGGboEcghLud X-Received: by 2002:a63:3387:: with SMTP id z129-v6mr154420pgz.104.1536191640274; Wed, 05 Sep 2018 16:54:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191640; cv=none; d=google.com; s=arc-20160816; b=LClrQLNjnFWjoP+F5cwLpwN3QdNAuGF/WzFUv7PeGtZcs5uSIJrcPIdLjXWr7woTgk XKnURPHsHGftY7RjB1oBLe63NzZJRfY5XIGCSkTdtd2HxAMk1jD6Jhs1oLRS84cC4/MY lQ/iSxHAVKwi6pPxq0k9uKDOrlDNK52qP0Xru49PPIYJlH5AhoQ1f6zY792jU73pxeZr NunwUiC9EEXQHo5AeRSA5z8dXv5iUE8ZJiab5ZuGfm9JYcP6MG1NmWh4KiXmdX9FLfDE GmPNf9dQ9+Vi7knFh8dgaY267S6B7Nrlu6y5dGu7OQfBDCj99azxMIiFHHE/mW2C5Wb1 U91g== 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=JV1ND1kmyaoPMqhR4VNx9a7L+yWo3L8dGbC1wHZQ/to=; b=fXmRZOunFDEP9Ipqdf03ZkHkOA2GaxSYqWgTVctEJhazTSRCtiBa1oED2nM7zVc44Z ycxTVUqeMrNAfKPDGx19kXxzaBUnTaA5IBwqLLqMHhDT5jcZmkEblcjCyU2KTTs0O2Iu JrlHWnFRUid3Y1A5B0c/A8xyRTxJLxt7OWd17nJdG0umJaYAM5bfb3fbdbp3/2aQxz5z HCUMvtu1DPGUsCb/nYImiKW00MJgqjJj/t55xkEcfFW3UWkqOhEwr6o3xzR7QyVXDUUm iV4NewNIed3tbmi//wnJDDRCHUK4054iSvpNFGcDCKTK3i1gY3jrPsptCd5MONscGvuI 1NsA== 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 y26-v6si3476368pfn.111.2018.09.05.16.53.59; Wed, 05 Sep 2018 16:54:00 -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 S1727751AbeIFE0a (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:30 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34326 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727636AbeIFE0L (ORCPT ); Thu, 6 Sep 2018 00:26:11 -0400 Received: by mail-oi0-f66.google.com with SMTP id 13-v6so17210408ois.1; Wed, 05 Sep 2018 16:53:39 -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=JV1ND1kmyaoPMqhR4VNx9a7L+yWo3L8dGbC1wHZQ/to=; b=mWw2MFVxzS3Mib7Vf9VmwMhjQt6GMRP4tuM3hFD3IsI+p1AJmEa4igA8tdA5EdMLz6 OInltYtggyUc9r38bOOPw4BpIIPFru3B0yw3DN1vCXtB/In1X8h+cDrdB/kn479YUdEy Cgy3BFRB+q2y3KBCcuCmwXHyhY06PPf7TLCvtzSfJCDtGD5fWvAwgMil6lBnRq/DhIU+ z6QLogf8HEoQ/to2utsU/Gs9Gp5jsySt0sgkZlODlPt422lPbLjmUZSVgeVZW5jaTCcx nJfzVHi08if1d2vD/96wHA39jBV8q6cGMuEapW8hgUwACqteIuMwK/RVw/99tdR/Qc0x frcw== X-Gm-Message-State: APzg51DQKVNXtt0Atszz7CfcEbR7oOm2Vjz+QN9bQAx/U7qY//N6iaNy OZ60B0MVUZSoik2qLetwtETT5FY= X-Received: by 2002:aca:d946:: with SMTP id q67-v6mr127379oig.212.1536191618563; Wed, 05 Sep 2018 16:53:38 -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 h186-v6sm3860624oib.55.2018.09.05.16.53.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:37 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v2 8/9] c6x: enable building all dtbs Date: Wed, 5 Sep 2018 18:53:26 -0500 Message-Id: <20180905235327.5996-9-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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/c6x/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 --- Please ack so I can take the whole series via the DT tree. 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 From patchwork Wed Sep 5 23:53:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146057 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp104411ljw; Wed, 5 Sep 2018 16:53:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbnVH+O1+CSDtwue9JSVhyLyQNH5CaVeJ1V3Bt6WXwughMK0/v6HOkaBdY3QgbPhrOxffRu X-Received: by 2002:a17:902:4001:: with SMTP id b1-v6mr122923pld.312.1536191631593; Wed, 05 Sep 2018 16:53:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536191631; cv=none; d=google.com; s=arc-20160816; b=qRW2jz893XjB3DGeAJIqtYAChzhV4Jgy4Q16bJNWLfz0SGaKbLC32NLb31NJUEkgpT 8fZyElUblPlMsA7wMnWQulLiGUezr2XW4FX3h8mZcfiNieDxTzr7ABwXB85KhiQdMNa5 Zf4g2zp6zQtIu43B0VwJX07bLBWh1hsSi8loJIlsxgw0cMcZlGN144BuvLWpUaUpRSG9 z/9tqBIx6gZNoG1MdfkefKyaFqePBlMr611oAqkHwfHFwqH5hrWPJWbCGp0ios5sb0uF FKSN4035KsZT11TabOJxv1j+/fYLMrnMxPgKbHcxj8pSoXC183d1LTYHjDmxOa1QQP8G +uuA== 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=nkJMkWyySy74YTvFhf6qJOX7nnDeyKVtkRXZ7YOmtxg=; b=sE5tG1hJySwbJgKzMbOjESECfj/aMMtGf3r+fbfvxRnfkhre2BEL8fNz7giXV9G8Tl jQj0YPA4oPgkDNf0zJ8BzIBgeOAujSr9z94bkr8XAVm6nVjJ3CEJAHnVhR2JIY8+zsq5 aOZBAcfGJVdXS0OptQ5/lNGY7vRKRMM9KAq0EQwD5QcWJ2ZAcy9WU0alkhzciQZf5I0e fv3eL7lafsjSlmVk/nQtEMaeVPZgV3WWiSBGdC5EvHqcDLPrgcQ4NRAm2mY/A4waiIPk atJrouinf8l2W2CQ78hKZrVXxzUtI2xrKIyzdFF1u9UOP48CI+gZ3/hqzKsywr1bqguC fMQw== 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 u190-v6si3649961pgb.270.2018.09.05.16.53.51; Wed, 05 Sep 2018 16:53:51 -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 S1727728AbeIFE0M (ORCPT + 32 others); Thu, 6 Sep 2018 00:26:12 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:45716 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727635AbeIFE0M (ORCPT ); Thu, 6 Sep 2018 00:26:12 -0400 Received: by mail-oi0-f65.google.com with SMTP id t68-v6so17082429oie.12; Wed, 05 Sep 2018 16:53:40 -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=nkJMkWyySy74YTvFhf6qJOX7nnDeyKVtkRXZ7YOmtxg=; b=Y4YdpG/KaK33dZ4awvxtur+wR3uwU0sno/IelohNMyHz+T+F3egRPkEi42dUyvFdyc iCF1t8/TqPCWF85kbORGGkN37f7TzvLQYGP8STBLMUVH/kpAU5bpWn5tKOsdhTo1o17F 3sYM0ccgRGV01n12D/f7PyMqQJacf+MbGdHUa1BA0BJ1nxZhzdvX9rOJ4HD7tVjbcHjd igG21b0w4dX5mPoF05obWAvH49AWW97PkpJXRMMxNuHLktHMeYHAdg4gGn9G+1oZXGW4 PJMJd2ZVt2gXWe+lXyVti3PhPWIjyFKoDQ+5z1tJlsixznfsEM/usDQF3mUIxQZx/Juj kPrA== X-Gm-Message-State: APzg51B/e+T5/UIBjQ/+ls/ih3oL5MCQeHrcdiPkC1u2OYEs5AILm1B9 mNwPmM6DsLHE59FJbT6YKo5uEH8= X-Received: by 2002:aca:d44a:: with SMTP id l71-v6mr110613oig.199.1536191619549; Wed, 05 Sep 2018 16:53:39 -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 h186-v6sm3860624oib.55.2018.09.05.16.53.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 16:53:38 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Michal Simek Subject: [PATCH v2 9/9] microblaze: enable building all dtbs Date: Wed, 5 Sep 2018 18:53:27 -0500 Message-Id: <20180905235327.5996-10-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905235327.5996-1-robh@kernel.org> References: <20180905235327.5996-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 microblaze. As microblaze only has one dts file, always enable it. Cc: Michal Simek Signed-off-by: Rob Herring --- Please ack so I can take the whole series via the DT tree. v2: - new patch arch/microblaze/boot/dts/Makefile | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile index fe9af267f598..c7324e74f9ef 100644 --- a/arch/microblaze/boot/dts/Makefile +++ b/arch/microblaze/boot/dts/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # +dtb-y := system.dtb + ifneq ($(DTB),) obj-y += linked_dtb.o