From patchwork Mon Oct 1 15:25: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: 147918 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4045265lji; Mon, 1 Oct 2018 08:26:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV60svtAqN8gZZhTdgXnlLrXwfuGarNVWHCiRKu8UOITkeGNeYzDnL7CnKjSVMYNK9DsifWst X-Received: by 2002:a17:902:2:: with SMTP id 2-v6mr12667718pla.178.1538407591485; Mon, 01 Oct 2018 08:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407591; cv=none; d=google.com; s=arc-20160816; b=gtmP2PJdG25T3+bMM6CYr2/u+1sPFiPayuYHi47CCrivsFXbl2ywf4PXG2f6rkyww0 0UFSvE9drhGhmjB0eVGBwgpeNiBtHYavx40urNmsewovmOhXJxujH7677dOngregTSpG Vmi5i8IMzAc2wAZR6wixJ/aF8Ho5Eho9LqQJ5t3eevEKoGaJhEFzq5gI9OdqWGgBIXV3 u4AlWxMepdoCmN9nph/ygaVOFx4GGlBVwFnI1GDY72sDx47ODnTg1ScKGOksMmUPpyrO LE3KXlRPnz9OYtPeprkeo6E78Irqu6vkhS9mknBcaKDIHJXzVGmCwPWihVskT8NuauwD sRSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=FWWpu/rZ73LHeaOx/3FicCXTVC+bW2dp+6ooQF6mKYw=; b=KRZsYS87MqiRlt+rYS44wLIMjFcbfWBOapTwWhpUFIWf/Mn+NVOJrbc/rkANPoKHIb F+iIQiquyXI1/NW9/dRCSCxDqXCuhmVI5VkJ87BDrHhSTicvNQzT8/0GWFsUocC14CYI fEr2XtVPvm2sk+1SsCDWDkJgf/+kkizaNEOpsD0O1QVI6huwi4+RTPDiWymgIYy7CNTn 9DO8S7yPEaMHH/gY4sWaLwGeLmBM+8mhDMSAVNInIJhIiJixeVX5GmDMo8AwT7s/tNZh jgitDtVdW30cDtsna00zj9X8CGkPrkfLujc6DdHBGElkQRLk083y5B4Q8xo92IniaMG0 qrJw== 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 y86-v6si12988194pfi.195.2018.10.01.08.26.31; Mon, 01 Oct 2018 08:26: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 S1729605AbeJAWD5 (ORCPT + 32 others); Mon, 1 Oct 2018 18:03:57 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:37226 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729579AbeJAWD4 (ORCPT ); Mon, 1 Oct 2018 18:03:56 -0400 Received: by mail-oi1-f194.google.com with SMTP id e17-v6so10647192oib.4; Mon, 01 Oct 2018 08:25: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=FWWpu/rZ73LHeaOx/3FicCXTVC+bW2dp+6ooQF6mKYw=; b=jwjlEUlqHfknZcmVHX/gng2XsekZOCF9s/XbXupNkqADUcqahX2UI/83T2BCXbJSHm lPDL39Z6GVq2S7Z/QxNqnqkQBTEJlcReLXsosyVXhal3VK1zLcMSuS++yeMIzjK4pmiM /5AVjWLK2kp4Tgq6afxTETfdIkKElsqs6uSCEwFWH9QlTAgIPvFwQQisMzxhXLUqNQhj Iev+j3/tlvOJSEU5zDsqvotyXV6HI+BuSrPkA60M6VyTIXTwp/NGU3GHLlojKB/02lkc kA3aes1SAl/+zF0eFq8SJh88lIRB79uZMHkmGRsbugm4UBr7FA+NUm1JIgZbyzVhbpH8 Rw4Q== X-Gm-Message-State: ABuFfoiJ3Rl4dPLcDrf0EyrnH3tWwgGtAYNDFMwY0nZp/M4tVwVb/3bo A3BVl2/XvqYAUS6Mcy0SVbUexLGwQQ== X-Received: by 2002:aca:e64b:: with SMTP id d72-v6mr2505124oih.314.1538407536522; Mon, 01 Oct 2018 08:25: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 s203-v6sm2047035oif.33.2018.10.01.08.25.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:35 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v4 2/9] nios2: build .dtb files in dts directory Date: Mon, 1 Oct 2018 10:25:24 -0500 Message-Id: <20181001152531.3385-3-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Align nios2 with other architectures which build the dtb files in the same directory as the dts files. This is also in line with most other build targets which are located in the same directory as the source. This move will help enable the 'dtbs' target which builds all the dtbs regardless of kernel config. This transition could break some scripts if they expect dtb files in the old location. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Rob Herring --- arch/nios2/Makefile | 4 ++-- arch/nios2/boot/Makefile | 4 ---- arch/nios2/boot/dts/Makefile | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 arch/nios2/boot/dts/Makefile -- 2.17.1 diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 8673a79dca9c..50eece1c6adb 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -59,10 +59,10 @@ archclean: $(Q)$(MAKE) $(clean)=$(nios2-boot) %.dtb: | scripts - $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ + $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(nios2-boot)/dts/$@ dtbs: - $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ + $(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 2ba23a679732..007586094dde 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile @@ -47,10 +47,6 @@ obj-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += linked_dtb.o targets += $(dtb-y) -# Rule to build device tree blobs with make command -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) install: diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile new file mode 100644 index 000000000000..f66554cd5c45 --- /dev/null +++ b/arch/nios2/boot/dts/Makefile @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0 From patchwork Mon Oct 1 15:25: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: 147911 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044288lji; Mon, 1 Oct 2018 08:25:42 -0700 (PDT) X-Google-Smtp-Source: ACcGV62kYNegQ8lqsPO0MB4lnyRoHnPR1QLsbj9fu4u1uEHMbjXpqxAEnAxa8YhD/fnppxUzhMFD X-Received: by 2002:a63:6849:: with SMTP id d70-v6mr10579567pgc.7.1538407541902; Mon, 01 Oct 2018 08:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407541; cv=none; d=google.com; s=arc-20160816; b=iDiT7g+C4yTzIkuOZdYVq28zsOdtMte45tWhz5Csll9JwgjMDgzOgGIY07XeH3tRYj MgZdx8XpQpcvtUbQwudk/7yg8GnoSg2mSjnRu8HDqQwwtWRdrXimsZZE+VskRD5ulmXd F2DaQ/FONfeUXpRzSpScSzRp4B96YXh/uxZs0q62gEd+c7CGVMrZimUG8OQMqVjf+1t/ gc0s4w/vQFZlsbjHY1pAii5QLhl5JjiJDiS5A0kBMiTv8lvieUgHvvscXsZk/Nns9yx5 lwbqpfmHTkcTWXFPuOboNx7473iK13qN0lbg4Yeqf0pqnBHknJWNxcybG/9vWmivJKrO YXQQ== 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=VBSQfloLiFu+iV9ea+7Ay6RD8pIsDvaRlrrmBcR9emQ=; b=sfi637WLuHv2iT6a80O3ARZCUnaPOXfgJbR6YyrC3SFiAHI6vaKnwvmxMeynooVm19 wBYzpA8lpskebD/Y1stTzK4MU2PoGIQJrK/k3QIrr/8NBempcDNLP41/NlptaTDD88H4 SsJzqpMVlHo64sR3SrO74Y4oW1dAuofXCgPtFxRcnA8kW2vwtVC3/Mz0Id6aUb01ZUzV JtT/lwBKXU7mzWh13U4W4MnR62+GmWCIrNYgyCCATJX0XJBc4yo7NqSVQ7ofM1iaIxvZ sm48exxXjJf2FLGvvW4zgQqSEdOI0EOYJLuRKLH+0tS9UW5oaw1/QsqBiGKYZ1S1GrW6 XYfw== 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 u2-v6si4791383plk.488.2018.10.01.08.25.41; Mon, 01 Oct 2018 08:25:41 -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 S1729634AbeJAWD6 (ORCPT + 32 others); Mon, 1 Oct 2018 18:03:58 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:44088 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729516AbeJAWD5 (ORCPT ); Mon, 1 Oct 2018 18:03:57 -0400 Received: by mail-oi1-f193.google.com with SMTP id u74-v6so11501480oia.11; Mon, 01 Oct 2018 08:25: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=VBSQfloLiFu+iV9ea+7Ay6RD8pIsDvaRlrrmBcR9emQ=; b=tyc0aCfNy7BElVlTwalV7ZYm6jy4xK8s0qmCMRI0Aydg1ZEhqbTYiaigMtALxIBbPQ hExnXQnrJwW/UvpapEYDsMrwQLrDLy9ZAoDU9knIC1+WKpAv4HYokHiyT9bTXC/tUYn1 tXjb4aRLXb1Dnn1eirj8EbxZ6L0Pj/aqbs+CRcRliK+beb395c3syleQg2I9K1WGBQre FxOoIBP7bbSEdbz2OBQnkxYu+HltKY6RG0+krzRYhQJXMRraPwaN1szABkrVqlvHc2Ug 81yu+yhMEjOaqQLf6SI0dTxUXNvyjG30O6IdSJUpp/k7likjAT/z0GMevDxfXiCj9N2G Kggg== X-Gm-Message-State: ABuFfogNBDoVQSONyUAi9kKXg/5Uf8Hd8oalWrwfzEG14b2+8j0zTkwc 5qs5nUHke4YXhJHizNtKRBJQKRfKIA== X-Received: by 2002:aca:e385:: with SMTP id a127-v6mr2895254oih.261.1538407537755; Mon, 01 Oct 2018 08:25: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 s203-v6sm2047035oif.33.2018.10.01.08.25.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:37 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v4 3/9] nios2: use common rules to build built-in dtb Date: Mon, 1 Oct 2018 10:25:25 -0500 Message-Id: <20181001152531.3385-4-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 Mon Oct 1 15:25: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: 147912 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044324lji; Mon, 1 Oct 2018 08:25:43 -0700 (PDT) X-Google-Smtp-Source: ACcGV62SEJ7BbrJRVmvLSIb0dUl/JYSwuaH+FP62+dZzI5nN4lsidnANjkhfhz27FO220lXWSy7+ X-Received: by 2002:a63:6849:: with SMTP id d70-v6mr10579649pgc.7.1538407543470; Mon, 01 Oct 2018 08:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407543; cv=none; d=google.com; s=arc-20160816; b=a0FL2QIxcprjvIliPQZIK5rCnI/rIxYTjFDLHZzdbxp+uTOsTLwhTF/ZtbXoeWJN9M Q4wNIoR2eB9nMYWxIAgLh2KsKKwpUlkZdbhKhMajIoqW5fDitrEJ1yE+v4N+Ll32r/e3 j8+upJjhhrsy8DELOKr1WhIcoKZLznblZ/7RQ8oz8QvTNp7HsiAhYkO4HjnyNtgoe23/ U38g61fktaz+1YpeJZbQvnH5f4qltWVqv/3gkPfuoPcdEHXuwcPqDMoK3EuciPNj+tXQ FvPpIyNpcpOjaPfOL7XNqRmxJ8uZzUezVgkv/lxr3b37DNbWcXv+4mTXmPcIoRlXCeJ8 5sXQ== 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=96bgZeDJu8lmzLzGQEjyQG1f1/HFZ+sSY2PjMNDbDoY=; b=ae+jfENwp8S3PzwvpG9e7Sg+OYg7rjpRtHtzYbKpEOUNtwLv2TbRstgb9V5PZBwu+a 7Rl+YiA3sW0esFdCJJvkz+NCH6rpBJw3eOVoqr/angh0HQuyqxQ+7b25sHJjsvB5dFx+ F24w/oxkJ2LjvXDLfHLfhrB/az2BlrpO/5WsaB2IkzYGjKqcE66EQcrxAgCq6re7HKgX 7UL19qNRsTQpYgohfrOeswNEdNLA9hUmk28tGpMDwCr+3Pq5GGfyy2c/62k41u/unvW5 KFo88+h8F+w7XWfDQ6EF7nN0fUIVZTWOfKGXdHosDkXZxpClxuYCwPWpJQPvBYZh4A9r CiFg== 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 u2-v6si4791383plk.488.2018.10.01.08.25.43; Mon, 01 Oct 2018 08:25:43 -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 S1729651AbeJAWD7 (ORCPT + 32 others); Mon, 1 Oct 2018 18:03:59 -0400 Received: from mail-ot1-f65.google.com ([209.85.210.65]:39344 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729624AbeJAWD6 (ORCPT ); Mon, 1 Oct 2018 18:03:58 -0400 Received: by mail-ot1-f65.google.com with SMTP id c20-v6so6912589otl.6; Mon, 01 Oct 2018 08:25: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=96bgZeDJu8lmzLzGQEjyQG1f1/HFZ+sSY2PjMNDbDoY=; b=F3aaTbMOeoc4Khz/PiN9swzdUYVLG1TB+nstWJqqM1VLqP8l9VdKnAILtT5sJUmWcc RtE9/xMNtN2XtUhnlRE6QZZVClmW9lQiDR7Uw7/OLQ7RInXq0pnPqqisn7X2z3OlSG+r bUZHRyoMmodS0tLi+7b9ZCZQ4u8qSRiiu3RosHOVG8qyMHA6EFZY2qamCZHyLDu4oOYA l8okO2wS+q7z5GmPhLgJyCQXUiDbCSAaQWSu9PK1bJ9pTWuA0ljiqswf9+vVL8nQQjFC 55wsTeXprB8x+1kdbSLyf2rlh4SZkyTX31bKCzrn2RIRAZTzA9L+sCgF6WqGS5SY9i0E Kyug== X-Gm-Message-State: ABuFfogbU5215t9+j4JuZhhMhpWQo/pK1sCWI5QU5TDJDnG91+M/BJi0 EO3a0t08yZaAOLbZ4/rvpewhvP2ieA== X-Received: by 2002:a9d:32c8:: with SMTP id u66-v6mr6234462otb.156.1538407538647; Mon, 01 Oct 2018 08:25: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 s203-v6sm2047035oif.33.2018.10.01.08.25.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:38 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v4 4/9] nios2: fix building all dtbs Date: Mon, 1 Oct 2018 10:25:26 -0500 Message-Id: <20181001152531.3385-5-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 Mon Oct 1 15:25: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: 147913 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044355lji; Mon, 1 Oct 2018 08:25:45 -0700 (PDT) X-Google-Smtp-Source: ACcGV61jmRnwP7twGpn9arHb7837g9cVL3ghnJQMw43ijdfQLDoyOhz2+D49Y/xxeI1HA1gKyGY+ X-Received: by 2002:a65:5cc3:: with SMTP id b3-v6mr10940049pgt.277.1538407545211; Mon, 01 Oct 2018 08:25:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407545; cv=none; d=google.com; s=arc-20160816; b=oPsX7SEMlwfq3LMlhDtwxcEAisZZ4KCVvhpMznFRr1aQDGK9I4etRAOvK3cBBIuyiB DADfR9tIZZfuMelrwZsj7GdyFAytzKpwDKGbFy2pgdTlcZCiN2tOay1JGH8SvHsDo+Vt G+tifcFP5ARh5s0uNasMEIqXVYdLc6/p7bX8IU/VngDjzXXy+hAzs5gP3rzhosArQ7Ac /LZOnshh/5Mxe7sxBjmkrxFXgW/vEXlWy1FKC4wwLmrCsVsVw7YQIn/jHXqIqtEC0qje PlpygmuUqBHnWWbizGXnfkfIL9/CYxKC8wjzqvLE2YiioCFiG2eOgZABVr7SeVCUGS0t OXoA== 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=OFEEaVtg96Vzr+wRENqq56ej9KS7VctFB/C9wMh58yU=; b=RJNgxF4VdOX98PLfIa107bU3tzELiX9IlcGU9/CZQINHaToW3ya51nw0r5HugMVQty H2gvdIm1Mlq7reblnL97eAmWyixoYtWn1hADqHrPCihshWJxOPSuUHTZdthxg7cLlWQ2 PrOckN4LBFmshExPjDNui1r5Zq5M9BaRQkKYNYnwA8qxwz6H0j1tbMnrHos+5Mq6qEFr 0zbGxmMRFCrfJiMA9LTqTfD9+FlSXb+GQRmA9WcfTZTisIVFm/AZxgYvnw7LkPT1bgKd UM5DZt0IbBJIOW7oKgLoh4PAJpzvMs280jNpp/XKlnNXpWLRMWVpjed8o8UGR0heEoTT 4lHA== 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 q19-v6si12988432pll.72.2018.10.01.08.25.44; Mon, 01 Oct 2018 08:25:45 -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 S1729671AbeJAWEA (ORCPT + 32 others); Mon, 1 Oct 2018 18:04:00 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:39919 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729516AbeJAWD7 (ORCPT ); Mon, 1 Oct 2018 18:03:59 -0400 Received: by mail-oi1-f195.google.com with SMTP id y81-v6so11515792oia.6; Mon, 01 Oct 2018 08:25: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=OFEEaVtg96Vzr+wRENqq56ej9KS7VctFB/C9wMh58yU=; b=aLWJhe9Wmj3hHW7/eECJnguh7okdtftxHJ8WAtnrm5P9VGe59agbK1ZjFJ59uACwXz tENDLCNiHFblT6O7lOca5b5Ox49JuLcVImebWLfiSCObPVl6X4RqbfFDvd2zNmwqkshi 8LtR3419t9ogveLvGovKyiH6t31A3dC9yAtPuE2JNpITliiDFDXS9crbtsQwDt59D7x1 1uh3G/qizsC1C7D6sNg9HNHQc46Q6jqhASDDgKakhpf44G1cIONnBnA2qEd5P+vlms8k P+BFo8bzOJj0Lw0Bu8hCXQ3Vr81j9sh1/fH7wBVVpO7bxmm19UpyNr7Cor1wWhVpCPyb hwQQ== X-Gm-Message-State: ABuFfoglrHA6CNOzKRdRFVO8uOKd62Ka8e/HtgXusowFdu7JoHBR/ETt zDNGFU6NCKuLEme9jr9CaDGYBy5K+Q== X-Received: by 2002:aca:5c05:: with SMTP id q5-v6mr2718814oib.208.1538407540039; Mon, 01 Oct 2018 08:25:40 -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 s203-v6sm2047035oif.33.2018.10.01.08.25.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:39 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v4 5/9] c6x: use common built-in dtb support Date: Mon, 1 Oct 2018 10:25:27 -0500 Message-Id: <20181001152531.3385-6-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 --- 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 Mon Oct 1 15:25:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 147914 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044416lji; Mon, 1 Oct 2018 08:25:48 -0700 (PDT) X-Google-Smtp-Source: ACcGV60CZXUGqRh97ZQjvwTwAYocXHJPpyf2WozPERuOB6uge6lEaqx0Gnp+z8cOyFFaQpMf8ImH X-Received: by 2002:a62:54c7:: with SMTP id i190-v6mr11864453pfb.155.1538407547969; Mon, 01 Oct 2018 08:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407547; cv=none; d=google.com; s=arc-20160816; b=kd6j0Bs4FRfbqq2qqvku+a06RzjCACAoXKUH8pfKMAqH8TpPN3DJNKYLcwMLnDlBQj ASDtMu2JXgbV9hJ+dp9OFeRcq8mmTpRI1o90585eWNMTeNPVKie9l/oqIYPXzDyto1Ix icSBDy/YsgdmOOUY0mFfQ3c4cZXkefbp4bXOLL7sDBogR/FlWWEMx3DSI+tF/nL5de0M e8AVhs8hn53LwXN0F4CyaprfU2kYpmGMkMov0t8fzul0xI/5f7L6aSJCPVePalVQrjZp KTfWphEd6g1rEjheUzzR+vI5BWDkiFPw1Yq/vNGsfosVVQ+d7LKIDCla+tSOR/GMVH2T wUog== 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=OzogrFexvBVWCFhoM4iFq+GU8ve19vvStlWEoVu1h2M=; b=Tbb0oJI3HjS218VcyADIlnCyTZNNxB6625O1c2Aopv4+cjJ/y2x7ODUoKj4/ggd/ke sdvsLCRASKsSYN1CtF0GmKk1VyaC7TeF3LWJhJPHl1a8Mx+IjWhw/62aRk1BU8V9lXUH 5vch48K+tz8SOWIp4S36uemRYObiOk9fove4hHF13U5Tt5Z9iX6e7zJC2IngKdpPc7a3 KXXZljj4nsR9hILc6lMuXbLC4Vcy5MNZxmdQxzHv8Kyf21wzc5j6mi70OuEoAl0vkKHI qNC0BcjD18bJXHYixnB0BSySPxdHqDcBNFsNU3b+mKFE2pVa9uxQmJlM3PknmGX4MBes qYPg== 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 h9-v6si13222519pfh.240.2018.10.01.08.25.47; Mon, 01 Oct 2018 08:25:47 -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 S1729700AbeJAWEE (ORCPT + 32 others); Mon, 1 Oct 2018 18:04:04 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:43633 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729516AbeJAWEC (ORCPT ); Mon, 1 Oct 2018 18:04:02 -0400 Received: by mail-oi1-f196.google.com with SMTP id s69-v6so11490881oie.10; Mon, 01 Oct 2018 08:25:42 -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=OzogrFexvBVWCFhoM4iFq+GU8ve19vvStlWEoVu1h2M=; b=kzdZLTPCdjt804semO/1Yfh+Wdsv3YtnBJWGJ/G7j+W/+PRJJWtv4+D8fshW1H7MxV PqlAuRgku0xgWeBhghzx8Q0zidTN01QtpWQ9Bo6A4/5+1lT5+ZLSflINVDHen/ii+sND +Cfcn0Slk3ZAo8+U0Ozp64vYw9nMOXIKXyS//lY5W/bceCKEOD2IDA899ngsvemaJKqt AP5L4sy+k7WtBTJlw9dk04wk/SAn/uEDZPJ/siL7PsZ1CtoWK3/bavDlj/ikbwJ4ToXU xTpLAl6f6MkR0H2eLtg2p9ipkCpwRjwevMEXM1J/e333HBwTcrMpCJhVqWnc3oQ6PL5A OxHw== X-Gm-Message-State: ABuFfoiX9UPx+O/shgAWI8DQHLeW+Cq4TdsD+Au7ZALS7eMgUoStumMr 8Y5qKzYZnR7L2JnRhGwMt9DAoTLLGA== X-Received: by 2002:aca:5195:: with SMTP id f143-v6mr4994809oib.336.1538407541845; Mon, 01 Oct 2018 08:25:41 -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 s203-v6sm2047035oif.33.2018.10.01.08.25.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:41 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Michal Marek , Vineet Gupta , Russell King , Catalin Marinas , Yoshinori Sato , Michal Simek , Ralf Baechle , James Hogan , 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, Will Deacon , Paul Burton , Ley Foon Tan Subject: [PATCH v4 6/9] kbuild: consolidate Devicetree dtb build rules Date: Mon, 1 Oct 2018 10:25:28 -0500 Message-Id: <20181001152531.3385-7-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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. Acked-by: Will Deacon Acked-by: Paul Burton Acked-by: Ley Foon Tan Cc: Masahiro Yamada Cc: Michal Marek Cc: Vineet Gupta Cc: Russell King Cc: Catalin Marinas Cc: Yoshinori Sato Cc: Michal Simek Cc: Ralf Baechle Cc: James Hogan 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 --- v4: - Make dtbs and %.dtb rules depend on arch/$ARCH/boot/dts path rather than CONFIG_OF_EARLY_FLATTREE - Fix install path missing kernel version for dtbs_install - Fix "make CONFIG_OF_ALL_DTBS=y" for arches like ARM which selectively enable CONFIG_OF (and therefore dtc) Makefile | 37 ++++++++++++++++++++++++++++++- 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 | 3 +-- scripts/Makefile.lib | 2 +- scripts/dtc/Makefile | 2 +- 17 files changed, 48 insertions(+), 101 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 6c3da3e10f07..251875470c5b 100644 --- a/Makefile +++ b/Makefile @@ -1061,7 +1061,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE # Carefully list dependencies so we do not try to build scripts twice # in parallel PHONY += scripts -scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h) +scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h) $(Q)$(MAKE) $(build)=$(@) # Things we need to do before we recursively start building the kernel @@ -1205,6 +1205,35 @@ 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 + +ifneq ($(dtstree),) + +%.dtb: prepare3 scripts_dtc + $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ + +PHONY += dtbs dtbs_install +dtbs: prepare3 scripts_dtc + $(Q)$(MAKE) $(build)=$(dtstree) + +dtbs_install: + $(Q)$(MAKE) $(dtbinst)=$(dtstree) + +ifdef CONFIG_OF_EARLY_FLATTREE +all: dtbs +endif + +endif + +PHONY += scripts_dtc +scripts_dtc: scripts_basic + $(Q)$(MAKE) $(build)=scripts/dtc + # --------------------------------------------------------------------------- # Modules @@ -1414,6 +1443,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 99cce77ab98f..caece8866080 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -124,11 +124,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 3509fac10491..9f525ed70049 100644 --- a/arch/nds32/Makefile +++ b/arch/nds32/Makefile @@ -47,7 +47,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 d67e30faff9c..be060dfb1cc3 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -80,28 +80,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..ece52ff20171 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -39,8 +39,7 @@ 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 -subdir- += basic kconfig package gcc-plugins +subdir- += basic dtc kconfig package gcc-plugins 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) ; \ diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 1c943e03eaf2..e535b457babb 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # scripts/dtc makefile -hostprogs-y := dtc +hostprogs-$(CONFIG_DTC) := dtc always := $(hostprogs-y) dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \ From patchwork Mon Oct 1 15:25:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 147917 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044936lji; Mon, 1 Oct 2018 08:26:14 -0700 (PDT) X-Google-Smtp-Source: ACcGV60o/6qBdMckRdBv6f9sTITuJDdpYnRnBwsxZqbSOkOBZ0izxvBeqGRjmxs1UNHu1Kzsbjw1 X-Received: by 2002:a17:902:9045:: with SMTP id w5-v6mr12634008plz.10.1538407574114; Mon, 01 Oct 2018 08:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407574; cv=none; d=google.com; s=arc-20160816; b=rDuMFgbyInUqX4pbtBlnUL4UA89DUMyDpKrfBVowcGKkAE5svwi4rbKww6NToqn36P DJ6dhqb3JQaucgAXKim8ztqpMFJE3S5JnKNjgUHLP8MF0lPA5YK111GjIe48k8/bsm17 I1kBEszvZWAvntQi0Q0kIINPzzuXXQAhmSGKQzVRNW9FwmTcCclaZmdOTs8UEMkeo88g fQdQRPAT/SxEIZO156sgoiDG9nvtZ6fjlWpfqiPuPr+9VAsYm+rWHbRSyQwxYUcAMZBC LenCwhKGYCjjJCpIZLxP+QPXLNQ/8I2a8c/OxFrWK56ROdkwmgxl9VDiR7KEla2GUzPp h6ng== 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=bfCjKvj/Rt0QdLyRoM+SklnSQ45TvYZysCa41HzJYLU=; b=zAUxxnO3n3XkU7QhiyQn8MYO07TN6JGjB5CA8iiFa2zX+PMr7qAXObj38X1152jAvZ t33cplJTaAVqP46sjoyG48QhcsZ1NMv2pZDqCdCxoZ9V3sqFqLADTpsm2JF6czpTLrv1 AqWl2eBinuwYeX0LNj3cF6axPI6Q6nPjssQ6fAIaEkDXlPJCw5YLKGf2S9Wn1zP5b/lV nBY+LwQEfO9XqLQGp+kk5y/vEocFHFiCDUJPiqoABeO3JA9UK3byRo24Ye5ywsRsxQ4S 3Fvw+MzTolEZ2b5lXSopn2T/ZPfgqaTF4VMKrh4edNw2DdOEUy60V88DTRvULqHM5Q2N 4L1Q== 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 g39-v6si6624516plb.297.2018.10.01.08.26.13; Mon, 01 Oct 2018 08:26:14 -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 S1729757AbeJAWEa (ORCPT + 32 others); Mon, 1 Oct 2018 18:04:30 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:43645 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729674AbeJAWEC (ORCPT ); Mon, 1 Oct 2018 18:04:02 -0400 Received: by mail-oi1-f196.google.com with SMTP id s69-v6so11490969oie.10; Mon, 01 Oct 2018 08:25:43 -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=KvhIB9veO0nFzraT152xz3NI1YDNJVRHTscU2YL7ekeKfl4dUTuIrRYaRmz2RsAOzh 7QIdUpt5QHMqizFbiepFwXRAGieSUVCQFzOgCdeuI8+1hnNh4qctUoDIE92YhGCEXF// nvjccNbh1o99p+MWPFNK8SCHBjSsZTQuMxnwanMGlt2ZeHMc3liCEYGYdxvu0IvsHijm O/D148Rf18XWOVre2i8u4UKA7Z4dMrWfBvxE8VuMbvvJ7WQnO4OxZj9VYznpoaMJZsOi nSBRAYb1gpU9SdLaBX+VaUw5RboDXwfdH3rWDnc8AjawZ75ypyMDjfK2bmylP5LWG/rR BdRg== X-Gm-Message-State: ABuFfoiMDXGG3Z2TgKYWBgOEy6w7zNU5Lv3oyJqZg9gH8vkgvWffAJci le87Mea8DBIdlEvgztAW1uEF/gM9tg== X-Received: by 2002:aca:bc54:: with SMTP id m81-v6mr5544107oif.308.1538407543040; Mon, 01 Oct 2018 08:25:43 -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 s203-v6sm2047035oif.33.2018.10.01.08.25.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:42 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 7/9] powerpc: enable building all dtbs Date: Mon, 1 Oct 2018 10:25:29 -0500 Message-Id: <20181001152531.3385-8-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 Mon Oct 1 15:25:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 147915 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044430lji; Mon, 1 Oct 2018 08:25:48 -0700 (PDT) X-Google-Smtp-Source: ACcGV609rrM4rtUkT0RJKh4wiVxDmrLb+bhfgL9mdomjElyibNJG/3qUmzkf7TVX39LS3dSzI1P9 X-Received: by 2002:a63:5747:: with SMTP id h7-v6mr1723863pgm.423.1538407548341; Mon, 01 Oct 2018 08:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407548; cv=none; d=google.com; s=arc-20160816; b=HEJSZovVxVSUFxdwtgwsF3E7kD5bNri6IIrEWxP86obUNv6YtViwoceO3wzeqes/01 vZWGdnZkRlvAAnp86nFCa2NQXIAJx0V40eeRXD1bwzSdRwhpEvmpY7macVRgcDiPlxHu 401PdVBsChXUKsdccksA6FQUpOtDC7fYRKJwZenPpnImpHs7fIGmzfj1eYxZ5BJgefJ0 jAbvRRWQ3X47vlR4EvZcmSHih/ZavP7vd2HBMRS77/m8AAQLrorwoAeJJr+90HZKnGnn WxWr6ybFLFt2k9NTjpK6sT9uUh37MfTracdfXZZh79g1juS4juNzfz6sk/w0U9PQEQDt HBpw== 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=kZySN/D1fRaGYkVeB0WaJuKd+aEwp6HX7O0XCzNmGjE=; b=IETZY2PEYMZ0pTgu7fGqH+LB9Cq4plH9tYcnFlqDTZgv4PoI9xtDXK2YIDQwS2HuYO 9Xbhfs37qbA53mN64xpm0gW3WRPmTzTJDFz+MTYEpIpJIBVvx4u4QFSg6Acyw0pxwErs ADYcQA+YPvfSqBSb2oMsOWNxgcHyrPbAsTJMkWJnGbtqWauEr7bekUP/2AUMGrH4Zing bjxDL0VM8S9Tgupdp9ccjniapLFM1ECRGUwvbScloINBidFtl8zyoqiF9gL6iiV9ubp9 cHUvEfQAQzUezmpjZDcs8FHuDNS2r9lWNvhbgYXVjwTSSfEhtWfLxEIK0KAARZsJ966L lKCg== 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 h9-v6si13222519pfh.240.2018.10.01.08.25.48; Mon, 01 Oct 2018 08:25:48 -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 S1729716AbeJAWEE (ORCPT + 32 others); Mon, 1 Oct 2018 18:04:04 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:35973 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729679AbeJAWEE (ORCPT ); Mon, 1 Oct 2018 18:04:04 -0400 Received: by mail-oi1-f193.google.com with SMTP id p125-v6so11519442oic.3; Mon, 01 Oct 2018 08:25:44 -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=kZySN/D1fRaGYkVeB0WaJuKd+aEwp6HX7O0XCzNmGjE=; b=hmTT24SNWcL0OzzKF1RRyPvIo/IP3/Sk8hggZQGFyZetD22JSCiwzkGW33k20HAWeW 8yAOqvhZB4yxlBNJITlE1ToZOeALFjUjtxUoqplFl0atd41e8RnofJ1kWv7AfoIrcdzG oO3NWe707mQ1PV9D9KNibn7vbcB2Dd3RbM0VH6TxPsokEGlf4ORcDh8BaBPS4v7/D3Nj jRsNl9upZ7gr+Yl40tPr3wu3tSX5yreeKhZSPEmyqQPbkoMjYhRSxSdI+XR1PmLUpFcj GlM87eLbWKoFNdhIsSEl2PhLJ+mBODlAKc+hzl/EaPVNXmOk3aey8pSuUpIiVaZmCRMK Djqw== X-Gm-Message-State: ABuFfogdninsZ5QJfRTC0Pl6sqYQvsvaqrWMHI5bHGEDCNguhcTyoDLO xyLYEBs6dBEN/u0lNQghQ7qocE1SvQ== X-Received: by 2002:aca:5107:: with SMTP id f7-v6mr5658237oib.223.1538407544241; Mon, 01 Oct 2018 08:25:44 -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 s203-v6sm2047035oif.33.2018.10.01.08.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:43 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v4 8/9] c6x: enable building all dtbs Date: Mon, 1 Oct 2018 10:25:30 -0500 Message-Id: <20181001152531.3385-9-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 --- 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 Mon Oct 1 15:25:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 147916 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4044554lji; Mon, 1 Oct 2018 08:25:54 -0700 (PDT) X-Google-Smtp-Source: ACcGV63bOCbLi4XLPc/hMLOZSQNJdfa3xh04aYlBytajx0uLW5ac6LL3YUIGFJCXEBwgOATaGhqR X-Received: by 2002:a17:902:1121:: with SMTP id d30-v6mr11984186pla.250.1538407554268; Mon, 01 Oct 2018 08:25:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538407554; cv=none; d=google.com; s=arc-20160816; b=Xqdo1ClhLHBIoNiUjNr9iRnRmxttXI4CmIZKi2Evpd+Pvlz5UFdGvFULR4DmAiiaCn Gcx8ApM9AFpqgm6UHSFKRKIcjvTEkhlJHFGaTZ9qpqtLT3Z9wd6tfrd/LgpmimZFMV7d PxbeulzON8jAVDccIfixN2Dvhpl/4ffOWj4hLTmby6/MJlQPyyCne7Dxk4n4EaKFz0Hw YsCO8DS/47HcpJcUBNfh7H3lJL0Jo7KzL1D3Uvae88jVo41P0SDC0OVwCwMuJad0GRvp lD2h4poHi0JXGF6pNIa80YAFvKb7ZIRthH2e2Oyz9nJ0Z9Wn/reE7JkiLRWxD/DEogti fscg== 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=xxRNCX3AaKi4QWh7oBGizaPAWtftQeBgmxx2yRMWe/c=; b=TMLFaa4MdTVil8vuEEUqYF6JwJnAtaQFhtcjeDeUzievxJTfuRq6xsS5zAANmb45U/ WBeDH8zRKo710RV8DmXxwNdFFaZbOiAj/bTs/q5WxJ3P57QTDCRhG6U8XiV7C3oijovQ SYMMclweEE9iJyDIF8KIGCAv+a0NdSwfXDXfSbb4OIBDj2+L5TypUvjAwYLR3vx64TZ1 QYEtEFegRH1ORdrcs5/ZGdyVi6ou8hXBtipPZEA/MRpBXzrvNwwlXsX/bIwrg6BPbwRV Jttv70qY6I6npu/yKXlUPTcWmflwnYcm85TRwHDdW2m8p3459cko2deViH5v3+PySsdo plSg== 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 16-v6si12205229pgw.208.2018.10.01.08.25.54; Mon, 01 Oct 2018 08:25: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 S1729724AbeJAWEK (ORCPT + 32 others); Mon, 1 Oct 2018 18:04:10 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:32908 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729516AbeJAWEE (ORCPT ); Mon, 1 Oct 2018 18:04:04 -0400 Received: by mail-oi1-f195.google.com with SMTP id a203-v6so11556480oib.0; Mon, 01 Oct 2018 08:25:45 -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=xxRNCX3AaKi4QWh7oBGizaPAWtftQeBgmxx2yRMWe/c=; b=ZtVO9rTv97GJECM30Lcs5oqubKTBAcCRX7B7g4LN5gxRAfdgZtnu5A1oscW+tiVdrg 7qH/E6Yl43CMJB2x+vvYGgINswLHfYBvZyMN3lUbSO/H7dEsKTethHiWUBjcn7rsgROD ELCkrwlerrk6AgvXvNkDVTmRei01rQ9nm+/wK5CPdUsYuxPJ2EBsnGq9hyzc6f33/Il9 gbWy4BAvTmLT23pPpKDS138tG+WSJ+2IjbwxCjBqhryTImVupF5rVQ54BOeHOIMlSX6k p4+0QBTHOQBxHSxrBx/0aDqSAP6x6o5Owmd6IHNBG32B3mOUEPJ85urkLH2r+5HEqpDV MulA== X-Gm-Message-State: ABuFfogp8ocgHKwvJ2GM5l3k6pE0ZvTwM2QBHbZDsUs4sT+RUyC1vu80 exlJE6NLp2wA2rHAyzrfE15vH6tIFQ== X-Received: by 2002:aca:dd0a:: with SMTP id u10-v6mr5439457oig.171.1538407545071; Mon, 01 Oct 2018 08:25:45 -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 s203-v6sm2047035oif.33.2018.10.01.08.25.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 08:25:44 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Frank Rowand Cc: Michal Simek Subject: [PATCH v4 9/9] microblaze: enable building all dtbs Date: Mon, 1 Oct 2018 10:25:31 -0500 Message-Id: <20181001152531.3385-10-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001152531.3385-1-robh@kernel.org> References: <20181001152531.3385-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 --- 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