From patchwork Mon Sep 10 15:03:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146337 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2596095ljw; Mon, 10 Sep 2018 08:04:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZBnOEILjM6ua5rX61teqtD/mRNtDlebzS6bSWiBn+kv51hp6G0ehCfhxUN5XdRvlKnm32a X-Received: by 2002:a17:902:7e45:: with SMTP id a5-v6mr22693372pln.151.1536591891770; Mon, 10 Sep 2018 08:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591891; cv=none; d=google.com; s=arc-20160816; b=XonTTvRjs1GlIk6ITWJc9gkbtUCw2keIKw25cg9u22oI2npNxNkkJ7mKN40J0uBj81 TJlBWV0b+fL9jiGMQD2oAivjC+dxW+4/+OrLr4j3wL5uN4hHYcMIj2nm9ywIYa/1bMZC 8MlCzN2+3Kvl7SgPrERSLV5M59fgqT5kqw7NHaCFIIAdrEVUJ/sLbbsVsGJeSYq/ByM/ IoIKreDqCKJGebkjOw/EqMzMAovu/Z+v7NNvEEeq/tIwofhCUxN0TPEk6obaKv3q/j+S TD7jjOJd9OYsayRBD8gJmcW2TeWZT2t2izJEg41FgIhsb3S1siGG/YZYbMkpV3Q7xBAS 7TbA== 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=FMKjpoZrwk+K/zz3cuKmL+j4ootdgapE7VH7dyiEnDI6uP1KINo0D9yEUEF7VZJYJH MSVWrVQ4Yxy0pG8Yc27f0oT15ol3vlDmFGzjOzYu15HHdub1bSKE8V4pUlSFhJjumaa6 +FAORzRT5MPsDpbHsNGy5t8X5EHlfIhL+DvS4B2XuC9O0F/SbHO0wkRa9wgx3oSqjXEa 9pgG26/guQCAxjxGhX4Xm8NZclYDi3o+80IBiNLij6DSFIisnyKWfuRTXREl7WM/wyy9 snZOgbROCokxN4/NJy9YN8wrDqG3zgLaYgBtP9GC7B7q44yCcBYeyHs/0NV75YzJYGSt NKLQ== 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 t199-v6si17945393pgb.24.2018.09.10.08.04.51; Mon, 10 Sep 2018 08:04: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 S1728326AbeIJT6m (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:42 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:45594 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbeIJT6l (ORCPT ); Mon, 10 Sep 2018 15:58:41 -0400 Received: by mail-oi0-f66.google.com with SMTP id t68-v6so40677381oie.12; Mon, 10 Sep 2018 08:04:10 -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=phcKZkpjNv2RAePbH5x0bNXfuaHhrfrtTS3mtFQo+mVGcBg1NVE0zi4goRUmHu1zx6 kyWSC3iCHaelxcJ1r2ICFlZuvAejbCU4ak1YtQOkqOIq9s8EpCnx3nSqNfUkzVhICPYu 4Wq0pmu+Y61ARcVNLYn9QPh+cBS8REG8S5epJgmK9OUECb2tpvnCc8+HrKlAwQjKCP4s zPxcjhdvI5dRlDwvzTmdIHR82gqNCyguKPXvep5p69UrwHzTD9oQ/JAExtjUrv1mAJF8 5DWHb3WGy+IUFT5pjjJrMOYRw2VLONJNfa8fsUXyQfAzakxq+Rs9s4xS/HFPPYL10N8U rYOw== X-Gm-Message-State: APzg51DjyS4S0EXH31Ua/ZAGTSwwrphtpAaXAz9psXGPzj0qwIDQhG/I DGBxMrcMl5G524bFZHxTTk5vwxM= X-Received: by 2002:aca:720e:: with SMTP id p14-v6mr24127698oic.40.1536591849845; Mon, 10 Sep 2018 08:04:09 -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 k85-v6sm49465631oiy.2.2018.09.10.08.04.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:08 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Ley Foon Tan , nios2-dev@lists.rocketboards.org Subject: [PATCH v3 3/9] nios2: use common rules to build built-in dtb Date: Mon, 10 Sep 2018 10:03:57 -0500 Message-Id: <20180910150403.19476-4-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910150403.19476-1-robh@kernel.org> References: <20180910150403.19476-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"