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 \(Arm\)" 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"