From patchwork Mon Sep 10 15:03:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146332 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595361ljw; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaMsVpJXnYbK3oBucgz0h2LrrwUcAPPc0ltpqvH9Tx/RBzbY2CJxZIbQhQAdhaBXCDUeoEu X-Received: by 2002:a63:e756:: with SMTP id j22-v6mr23428165pgk.185.1536591858178; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591858; cv=none; d=google.com; s=arc-20160816; b=hHGgTdCa3ORphZFSccM6YA5+usIUMEqXt2/fqHxqseNnzPZPldhRZRUwy2BXDux4DC hXyI8QXZ/I1ZOCAPNtZZ2+GcDe6m+jFGrBeCOeBikRF2ZVHe8wrIyT0VG7Mm32KggaAE LTBWD60P499VuezpudEWo3U7tqQ5tBHthFvuauXm+apXXilUNXPHFufYrdnUnt0yUE4y qJ+w3UCgUm+w6Yv0IcoogvjBBDVX8ZZCju+ilcTsKny2tNyk9cn6Af3xJ++bBe7CIIu5 ao2jxg+Zz83Bmw20ucXvfftIR9y5Cd4i0WMaaaXv2gVvMn0SZKyTKKi0lxok+gR/1v/N VeCQ== 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=8cEA1yXkOtSkcSxK2WRBIl5IFgMaiOSbOBhvlAhints=; b=FiE56P550zLRnCzx7DQ0Z6Rz4pf7OrwCNiikWp29Dz8jGybz1YIRSF9v5VGGe16gno hgbckD1J1NHU1LLOGPMrPChH3wxibUYQx7+p2q2zdNhfFOjTgWY5/fP+4SahfNQaOYnH 31zCsjtTecE3Ix8T9MEZKX5y2dorFsS/yEZMUh50rt4dqb07jRb9KwWwz6p3QpAhSWo4 KpN21RzlASvwUnnFTXlPCNgJMlXHrUKoU6tc4pzoZuqwtGseCcRV/MXhqD9AHJRUp64v btfTSMbBveBUL1/8etRZGIlRAKWWxOlP0LoOJXcmicCOemTBuyCWuueZf41OxFGvE0xH bUHg== 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 u91-v6si17122333plb.73.2018.09.10.08.04.17; Mon, 10 Sep 2018 08:04:18 -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 S1728218AbeIJT6i (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:38 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:43522 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbeIJT6i (ORCPT ); Mon, 10 Sep 2018 15:58:38 -0400 Received: by mail-oi0-f68.google.com with SMTP id b15-v6so40699689oib.10; Mon, 10 Sep 2018 08:04:07 -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=8cEA1yXkOtSkcSxK2WRBIl5IFgMaiOSbOBhvlAhints=; b=uX7je6fFDvxeHwoco840v+/fh919tn4dQ2gFbOkIv3o+6h7BamiPYMmIgHOLDjd5qY hlBn7oLw9mR/+HfgiMFQUBdWd1jdVlKVzAmo+mBMz61KItA7Refx+PblrQDvFwiWhINN LGcAewXMD1MhFuN3sw8f+zEAujBWU8qyW/RjZmtfW77Bc5lY70MhfehkDY8DXO/wJuFC IVKfpU8Tkq9hLJqCGuK95Gf8sg0GV6LJ0IYjWbYG2XKhb1bZdc4ORKRZP3mYWM0Lu8WG YB8Fde9tBePfu2cWA1GKqM2mDQDWF+Sj3PE2CNRv7Oqah+cMPjzyx5ziZK0n1ZgkXPCL xBoA== X-Gm-Message-State: APzg51C+drMouvEVKrQciRfovo2ls5eYg34AIE8xdKtH0viu4DpguVUH j4nwWm6wYfeueXhXL1OLlOyIewE= X-Received: by 2002:aca:d0d7:: with SMTP id j84-v6mr23216114oiy.37.1536591846179; Mon, 10 Sep 2018 08:04:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:05 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 1/9] powerpc: build .dtb files in dts directory Date: Mon, 10 Sep 2018 10:03:55 -0500 Message-Id: <20180910150403.19476-2-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 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 --- v3: - Remove duplicate mpc5200 dtbs from image-y targets. The dtb target already comes from the cuImage. target. arch/powerpc/Makefile | 2 +- arch/powerpc/boot/Makefile | 55 ++++++++++++++++------------------ arch/powerpc/boot/dts/Makefile | 1 + 3 files changed, 28 insertions(+), 30 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..bca5c23767df 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -304,9 +304,9 @@ image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ dtbImage.adder875-redboot # Board ports in arch/powerpc/platform/52xx/Kconfig -image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200 lite5200.dtb -image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200b lite5200b.dtb -image-$(CONFIG_PPC_MEDIA5200) += cuImage.media5200 media5200.dtb +image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200 +image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200b +image-$(CONFIG_PPC_MEDIA5200) += cuImage.media5200 # Board ports in arch/powerpc/platform/82xx/Kconfig image-$(CONFIG_MPC8272_ADS) += cuImage.mpc8272ads @@ -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 Mon Sep 10 15:03:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146331 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595372ljw; Mon, 10 Sep 2018 08:04:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZBNe3k4TwXdlIKLWgW6Gc8fv6shrAez8hK5hsfvK+FlBAx1bHp2zSHwR6N4DOFIbBCEC3j X-Received: by 2002:a62:5302:: with SMTP id h2-v6mr24538299pfb.183.1536591858712; Mon, 10 Sep 2018 08:04:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591858; cv=none; d=google.com; s=arc-20160816; b=lSv+oKqLBDyVMcw5eNkg9wNqlPIxPSv8ZwiXFfdACF9TN6yCFa3/R2tpT+1xoDL1xY xAv2aP5fj7oAVYfsMvA64/vV67IvkpmLYcHGND2S/rTB8EF4sAwU3cuPIlJFD1XxSbgi 0NF/j4I1SfYp/QKy/wSrpJrvRjP1n3L7AqucpxZJU2h+PLllJlu+LyKUCNjccwZfcSbg /uYWTmgzLS+PL2KCAyrMFbyRmwzbfbVyv//Os9WBoFljg+osbUlzZeBESqRUSnXIhF30 eSQd0rdaFfWDh+CxwgR0B3eFQhoIXEeI9vqD19keDxJkQ9ZGfma0eG7DOR0H1VncDWmJ 0qGw== 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=CfKbZQhj+1b6D6bXJEtB+v1nqWjQX524ISJArZTzfzyrcrWLVohuNkTjW33bBlgSES tK2PtLUEnA21H6SH+8aB4OTfxHXSDSc0KXrk2/bAKHnJJs3CCfh12Fdyt0bRvtsQTZrn N1CWUzMrVP4AMLGRVNmiSKAxHBsyiD4+EPkg5HjRqjk07qvN45LKqMDtzGP8tphZBC81 zSD3mrDm5c3kP63vrH3njN6LqRTDtF+OlLw1lb4Gr2bPSqrUFIaj/EvgT03XM0ZlpWja /ccaBI7UxGED3ocCrO/HwKRDa27FGVOZVsgIS7WnOWHAbwWpNzsAMmrVv4zFptZaruL3 oN/w== 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 u91-v6si17122333plb.73.2018.09.10.08.04.18; Mon, 10 Sep 2018 08:04:18 -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 S1728418AbeIJT6m (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:42 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34164 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbeIJT6k (ORCPT ); Mon, 10 Sep 2018 15:58:40 -0400 Received: by mail-oi0-f66.google.com with SMTP id 13-v6so40834807ois.1; Mon, 10 Sep 2018 08:04:09 -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=kefafvhJqGEs+89d7ZqLJgu5lk2d25tW2bOqjFoEcpgyiLVBmggCtOe2pJF9haQS17 REvhNXEmVenIzUKAoleiLZuTWBYBTmhCJs6NSNtsWKIv++n9H3s0hzv17vycz/3d0ZtU F5M2kitc5Zj4fR3l3W6ooB/vn1AIBNSiSPS3KijU9qpxp45pKtHQh5O9OLPwtQbuC8qP BtF7cj0H5YPSYkIqxo2Zt9et+oYzcSdKQCrvwu/NrfHvD1VyY0qWR+zeplT3EicAsru3 7IRPQDoD8rHT39uDt8M8axJ5/FOm0u8ZnU25at9fgyrUWjcztatqBchSHNN6AaARFTMC oOMg== X-Gm-Message-State: APzg51AlIMC7HBQESJyiPBNheNn0q9y1doStBUVNh2X8QifozXns7RZ7 QzqDmXle/crqWF/lqcekYXVrclA= X-Received: by 2002:aca:d0d7:: with SMTP id j84-v6mr23216316oiy.37.1536591848651; Mon, 10 Sep 2018 08:04:08 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:06 -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 2/9] nios2: build .dtb files in dts directory Date: Mon, 10 Sep 2018 10:03:56 -0500 Message-Id: <20180910150403.19476-3-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 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 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" From patchwork Mon Sep 10 15:03:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146334 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595414ljw; Mon, 10 Sep 2018 08:04:20 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda7gzrXtiuoPQpRCz7HDhfBiueyJRStJBMqdyoGAs7s/p9md+D5OJTkRvxZ/CvU+ASsZaIm X-Received: by 2002:a17:902:6b47:: with SMTP id g7-v6mr22720957plt.128.1536591860680; Mon, 10 Sep 2018 08:04:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591860; cv=none; d=google.com; s=arc-20160816; b=lEM17LU1Y4d0diDVCB+9EZ/dPrl0sALqdf7lxvGgqZYXFB/6RMk9tgrYIFQgJ+uUwr DgSGiMfrrumxSKYnl5Cqi0WYDe/iV+O6U5leKB1cnNRe53BtIdBI7cUAvHkrpoUt2vO0 vFhvgHwnnU9Y8NCMsLImLtXIBhMWScmlNISAL+LavDwzvn0vKTggcTp9bGii28wBBedU 2JQmmPgNIIedjkvcw6CSbo6g8Sogq3PkxVbPYp8Hp9XWMZriragJybAD573Hko6DYyXK CHCpMo25xbu4SdgLsxToU9SgGZvWSVpchmQCANbXkKHmLjyE7TpwDJlYZTQpEC56Om+E qbdA== 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=q0cB5d9Gymc12c+PmOlI4LRhq+8WZjhxDXcoyAvrgGPn1q2PfgpnwVjyUQpmzhYRf5 O83jPMG2eA+JKqPoTjIK5kGDB4uYl5QqRxGs1dRlCiRtWrq6HUsNSOQxUaeSu1WVJ6gq XBfunyK8iwfUu4zWl33cO2heaSBMK+CrtsN1hFg5gbM0O6bjeg0Y7BP8w+xBFLxgE5kY d+D+AGQkex5aopiG2Ag6zEfq8VTT5YLsDXc11w9JneYcv20CAnBMYlbWVPCVASUQ/5MU XdSw6Z0erPvUWT/HnYdbSBwsr65CzhvSrbssci3FwK9iDPXLWOzSUXfCzRTHK8VY3pxh CWuQ== 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 65-v6si18054730pfe.49.2018.09.10.08.04.19; Mon, 10 Sep 2018 08:04:20 -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 S1728618AbeIJT6r (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:47 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:43556 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbeIJT6r (ORCPT ); Mon, 10 Sep 2018 15:58:47 -0400 Received: by mail-oi0-f68.google.com with SMTP id b15-v6so40700776oib.10; Mon, 10 Sep 2018 08:04:16 -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=NJXqkmoqngjRO+h68JUhVBkwT5wGvz4tnPMIdMUnrz/T/Tl8PMOUfrjKnkhBa8x9S5 2wOOaCLnvRbQBRrGl85bqemENNk+IM7mXUVpKwZiIHiOeBGkfbdwkx9p7BtSDwJ4Cctf cYUIJ9VBw6bTGjcSwlGeMpbHZizWa+XqEVAtApApp5Po7v0aBlrrj5JeVuqS0Yd5DeQW YnflYxhD2SJRin+fW51787tBwBq3YcCV1ilTH7J2uiaL8gM+5F3O3mQXjDl1J0MOdL73 KeMnZYo4BnEr9Dm06OV6nsnDByHMup8fycd54COhVJ4RkL1TEnTli5aQ39LR8LNzjH0a 16Sw== X-Gm-Message-State: APzg51DkJAONxTUtQ4aagVToCu8ZXoR5s0QGZNzET6nnJ1yriwUgPWRd UwhJ3V2mbyBfy1QynOxp0fGCayA= X-Received: by 2002:aca:c5d8:: with SMTP id v207-v6mr23101050oif.264.1536591851179; Mon, 10 Sep 2018 08:04:11 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:10 -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 4/9] nios2: fix building all dtbs Date: Mon, 10 Sep 2018 10:03:58 -0500 Message-Id: <20180910150403.19476-5-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 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 Sep 10 15:03:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146330 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595454ljw; Mon, 10 Sep 2018 08:04:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYjcNGM68t12S7EtbNUDV8cVrAE2IULDxiNAy1dJVjx0OBao7vqILftaxPKtYHCo3DTTRa3 X-Received: by 2002:a17:902:3a2:: with SMTP id d31-v6mr22339998pld.287.1536591862446; Mon, 10 Sep 2018 08:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591862; cv=none; d=google.com; s=arc-20160816; b=YyEak+LRensgRDgR946cRAmv4rhhnNK57C6ulL23hYaiMPS6H9qEDYlPVKC0rJTgV+ fMl/kEjWN/m3RGN5Yr6enfRnptBTp+aT9dOwhdC8l/ZftIAIOqBkspJatFBv1EcRAvpv do51xpAgsLunK7HoJqpyMLt9YhRci/Zc0PZ1XdTFwgXZ+U7/3GkPUxILpf7pVCOEuqhs DuXr9rZ3TYDTwxCyu+N3X5d5zku4954e6IzVdcLluRed9Nx08tm1d1lljyV5ZHaMM/2q rB2o2M9C7feOCLXKT7PPU0a8+Fp9CvojuPN5pBlzmyCKeaVnmWVP2EMj5iJWWlQlcN4+ a7Lw== 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=nDaz40qmCjxqX8/0QrmV2AoWr3i7tfSGn2AU2jWZf0njl+DOWwG+a5FgS/ZtMxEr26 +2Nh/4H9Wh86ywT7FVnxzC1s4tFtg0pOtg3vswWXzXwuEVHh4BKgbR81FpIGkre4IPgr QkhwupH/Qx2sQITXYAbwi43+OnLizw9UxJNTvucEzPyyd1au6qqA0hS2YHQC5uL1NpdN tX3TdRqN7B81BA5caYMUiZST8u8JhL7BcRE5TwlF9owTSAVvK1RWuLcdTfL9jGElxDro Sq5hNmCPhJbukdkYTGwB/ISI/otYQznLxh53d+xK1+6Ye/Sgr019TQN/oKstKMmwMdF+ Bc+w== 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 d10-v6si17142965pla.436.2018.09.10.08.04.22; Mon, 10 Sep 2018 08:04:22 -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 S1728819AbeIJT6u (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:50 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:38848 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbeIJT6s (ORCPT ); Mon, 10 Sep 2018 15:58:48 -0400 Received: by mail-oi0-f68.google.com with SMTP id x197-v6so40749879oix.5; Mon, 10 Sep 2018 08:04:18 -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=ES7gQdL0fAyRZoWgzsoK5uwOjhIPd3NzwHhHUEGjm/SSViBYiqbi8+M9xhw0rdiEzj 8/KdG1HcfaSJb5jTON5uIWtPB2mipTYerQ1AXmoBf45nHVitNEU+cpX9U6ocKyyLOany ujWfC4A0nixeOxGnrCf04c1w9ywtjwrkUwrzminZfW4XP22YVTLh2gIs9/53Uo7u+9gh RliD1zVuhH2kNXQZhhv3LqbiRowu51iGyHVoNEO+YO2FfyyWAKVQim8g+xW/a48LIptc bhyHFG7/3181VxaCYq7jkJKeiHk/OocEf1d5XICPXOukVuaHFQ6TJUvUbJ3EnFDZg4s4 nY/g== X-Gm-Message-State: APzg51BeDjak5kUk4IgYRsRzfLdtIRlmMOBvzY9W9xpHdlnh4bHcM80S URN+fw3cJnrDFzXhlfhyRz754Rw= X-Received: by 2002:aca:3110:: with SMTP id x16-v6mr23782030oix.126.1536591852622; Mon, 10 Sep 2018 08:04:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:11 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v3 5/9] c6x: use common built-in dtb support Date: Mon, 10 Sep 2018 10:03:59 -0500 Message-Id: <20180910150403.19476-6-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. 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 Sep 10 15:04:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146335 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595602ljw; Mon, 10 Sep 2018 08:04:29 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda8yLEiNXf8KrctDqoWp8B6K0OMCJaXIx+xp2DWrrKRoZGw7cuXyG1EkGspdlBQpYW7mYNO X-Received: by 2002:a62:198e:: with SMTP id 136-v6mr24353011pfz.103.1536591869224; Mon, 10 Sep 2018 08:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591869; cv=none; d=google.com; s=arc-20160816; b=dY04HYKHNUTX62M4C+qZuj7QiRSAGy4iNXrvnYb0377MszGKhUhjuaYfbvGxOumlBx yEiuZ7zvoxroNlSou/lDyEjG5dK96jgorAxGBEDQDPZPGiGKRw8/RG0ouIIWw1StMzNH +0qQ4kHti0I5pVxUatC5/Q62dqB+YNAGeCwiytKjude/dWIiTc/BgAVKJMMtFCxHP5qu +HZ5oklPzcYv5jGComAUmC5XoXk7ClduU1CrnLkTKaBgcB6pEhjeG339MtXiZj+IM+k8 QH4pKeiCE6PNm+GQUqMMeBqAMD9O2N1QoL1g8/v/U/xxnatglQDEiUb7/lKSsxECjTnW Y2RA== 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=NgzD6iR/yLdzugzBHphmWvtN8UG2/St1QOHT1embSQM=; b=iQD1boKAUc11qUjQd5eGv/yJyvvskIMUKRCUpBg++/FBlliaMAyX4umt2VNcwt0bt6 OX5hBlyC8K0gmn9/Yh3nrRanYvsXv/uBNgFQxcwpQXx1+/oNl8qRLBhFYJzJz1MCQbKn j5qu4+Cq6ES2dP9gxoQ2ymn3vO/inj3eVsse7gHEGXawytjim/9dKsqcYt/g+3e2NuXP qdf95KLYq2vwlm0XEkV/JEGXYsvxsE5ksoVrLrzD2W6IJ8bY/wwXi7173lZQ3Onj2WcD 3oCmhkUqAk18EQspA0ZP5co4UKjx9pa1pd9LV7QRfy5RFDQzaQONNm0lkGyKEKmeeaYc gV8A== 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 p84-v6si17495413pfj.101.2018.09.10.08.04.28; Mon, 10 Sep 2018 08:04:29 -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 S1728902AbeIJT6v (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:51 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34205 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728832AbeIJT6v (ORCPT ); Mon, 10 Sep 2018 15:58:51 -0400 Received: by mail-oi0-f65.google.com with SMTP id 13-v6so40836112ois.1; Mon, 10 Sep 2018 08:04:20 -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=NgzD6iR/yLdzugzBHphmWvtN8UG2/St1QOHT1embSQM=; b=j4MF2S6CDJhpKne14yuKXsNcDi24N7zB8OzWtkq4zY02XQwkSPo6L8yG95VKRWv8gv 3ttYMSV/mYrOqRhNhAsHam8efTEo7JSp2ZHrTii4JW3hOEXrJZG8I567Vq2LiqeiIs4/ /rfpkOJC7CCUxQEaQxp80vxIbOF7FWOUm+C0FPCP0FQVvqqWkIPxQ+7oXtIGbRpSexQb 7UO08YDDikC5KkevRAknPkp4ZRhe+Dy4VjIChHvf2UsgAZ1EbE67oHs+MJHFUXzqPahv ojg+XTq3u4nFMsn2QO0AA/O6V1BZHN1yZJLVvd1wfa/EO9Swxrf8UDoT5eFsTpuLRxZa msyQ== X-Gm-Message-State: APzg51CeSRkhrLl3WUEvbrwULYcipGqJFzcjm3kHcofID/hxJyxoJi8T LavteAF7dQAvodaoEWaDHL1O1hw= X-Received: by 2002:aca:d7c1:: with SMTP id o184-v6mr22914623oig.347.1536591854181; Mon, 10 Sep 2018 08:04:14 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:13 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , 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 v3 6/9] kbuild: consolidate Devicetree dtb build rules Date: Mon, 10 Sep 2018 10:04:00 -0500 Message-Id: <20180910150403.19476-7-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 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 --- Makefile | 35 ++++++++++++++++++++++++++++++- 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, 46 insertions(+), 101 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 19948e556941..c43859eba70f 100644 --- a/Makefile +++ b/Makefile @@ -1071,7 +1071,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 @@ -1215,6 +1215,33 @@ 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 : scripts_dtc + $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ + +PHONY += dtbs dtbs_install +dtbs: scripts_dtc + $(Q)$(MAKE) $(build)=$(dtstree) + +dtbs_install: dtbs + $(Q)$(MAKE) $(dtbinst)=$(dtstree) + +all: dtbs + +endif + +PHONY += scripts_dtc +scripts_dtc: scripts_basic + $(Q)$(MAKE) $(build)=scripts/dtc + # --------------------------------------------------------------------------- # Modules @@ -1424,6 +1451,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 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 Sep 10 15:04:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146329 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595385ljw; Mon, 10 Sep 2018 08:04:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZhnix4C4nTNzpTmKK12HOVLY2WVZ9MZkGklSMGJ2o9XnMwzTgbcJ15hxVnraTEWxw3iHR8 X-Received: by 2002:a63:e255:: with SMTP id y21-v6mr23255374pgj.160.1536591859206; Mon, 10 Sep 2018 08:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591859; cv=none; d=google.com; s=arc-20160816; b=Fu3H8PjhlXbfQeeQDkEv/efxQ6i2hwwbj3AELhbuxVCViP4bIIaIRqK9kmuWTg9F78 Vhi5d25bcTHpcRR1IGTH152/1HtqxaIdN3iMlAymxeEOO8PdBcAzqlWAyYZRZDIncVS3 YsI3v60l24s6j7iKct17lP34xpS9MFKQocd6vkekJh9YX7zKxKvNAY632V8867rnPpYm sQKQrhV7mpchlwk6YvQIQFxkjWurIy0QMaiSf4KAjCGZp970ynVSdlQ/MdL/bj+3MCmt l7YaGFZDXG1HX61n/tulg/JoWY2p9LWqPtjWJkdbnuMUg4+ZfyDkkv3ZyJzJkybxFHeC ITWw== 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=OCDxXtdT+BT3eR1O2K63+aLEMO4vzP2pxNu4bzQshhbleJVDJZmPb/d4bnJBGRAB/d 8npCUiMiXjUjMnAf60aEmUBKznfCy+9Ky8ZjJuD86Ll8xcjE/AwkoljZfkksNXRIZFMm oxQNh83wdlq1V4N3DDHEi6pNwIXLPjPUSMMWnhzJlFDERwFhJwu3gL179h8tVHp8lOlo WUojIXSLrEt8ANmPYOhEFJrrUmKiBXf/tUYRdgQuGAgB02KFzOEILWjwjpd4vAOh4Rhg OdPjKanr0QMqKCgSyy5ufme2Ee4dN+e+WY0D/owBI3PLYOYO/uo4BnXyVJSLuCyhG0v8 BYrQ== 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 u91-v6si17122333plb.73.2018.09.10.08.04.18; Mon, 10 Sep 2018 08:04:19 -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 S1728518AbeIJT6q (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:46 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:37447 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbeIJT6q (ORCPT ); Mon, 10 Sep 2018 15:58:46 -0400 Received: by mail-oi0-f66.google.com with SMTP id p84-v6so40746957oic.4; Mon, 10 Sep 2018 08:04:16 -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=HpZ11fdm0L3hK7T2c730vlRYHfpHjXXMdv3GOSRB7l9GJleUppSAlBDKjUaxBqsp3h QfDT/gH/Q+2ak4/z5EVgClJDVukSPCBPtpeDkSD5txwJKX4LoBwiDldU8zIfqPuf28fd 8ulJ5YbFdcveXmjA9A/eJ9Z+a10+MV0Bb9wUeFjz0mF8LAEGUh3RZdye2F7sYtfbk0pu 3znuItpc4r8U6yrQoOgFxIDh0a9m8OfJEXHooz8zE7Uw2qTDisDeID7qE0Z9pg5EhiXI 1wbeWsEGswNEQcSccUvTJjqkYPj8gXkBRWlAVGM+G3+JoEmTAEwirv0qM767GSUoEi0z L3TQ== X-Gm-Message-State: APzg51AFQurMMa6yRslr0N008N3fAm3Wn3s3Vag4foR/rkvI5+jeHmvj waskJO/eeCRgl9v3khJnxwZ4Xok= X-Received: by 2002:aca:57d4:: with SMTP id l203-v6mr24246520oib.329.1536591855275; Mon, 10 Sep 2018 08:04:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:14 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 7/9] powerpc: enable building all dtbs Date: Mon, 10 Sep 2018 10:04:01 -0500 Message-Id: <20180910150403.19476-8-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 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 Sep 10 15:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146336 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595812ljw; Mon, 10 Sep 2018 08:04:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdahKppQPUModo4gf0yeZMxyWnVU5A2kFALGqWchIUf1/9uevEryshp30+r58m+O3lBjqfIy X-Received: by 2002:a62:2b50:: with SMTP id r77-v6mr24076649pfr.51.1536591878923; Mon, 10 Sep 2018 08:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591878; cv=none; d=google.com; s=arc-20160816; b=WOf+GV642qMBetQ1uHG3Cdf6ZxMQEowBaIG995iv1OqNCIO3saHE6b08lIsJyGBHb4 teDp2SurUdfQ2VhKFOLKvz0ewRAak+3FsL/Typa2t4gaHNlqFQdAamCvkvjNfBYaWbAc lBJfWk9g3KB1cj2dWGwmE9vdrA+gk/4/hXVMiM+GpuQiDWY5R7nwMY+ePSE5GuPyGIB3 sMP34gauzjA/rQsPP5HcvJuJgn5UMnACPRi6lfw0Xkf09Coc+OxH1JmJjcj7kHO7yfah v75SQ9HmNCseE8oUeT+sPqsJqf3irzc9Ctv7RKqYeoCFNkGA8jrkf2cTwtXKVAj3uBsP JYTg== 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=pYUOpFFl5hf4buOqD3lY7W7uwGnNaGdHVGvAD8H0cjqD8crS8KEjbtjQDfHuvxruGF 4xgcUuggVjl8rHZxfP6gVqDHWMLCKIGED6c27ER0q/oNbDSy+XauR3wcrEVkG4QYrT7r /5XaX31RKW70vVYcV0QT5Ohz9xzwxzQ+QanwhJLMtNhkWSA+tpdHL4pFQFEO2V2Z5kRu 7FMVzGhRDDNh7Ca8K9E6ixRni+0fp/qtSV7k7Wgu1OePAvsITSjJzoeqRUbhCuJQC5LP uuQvCUpRDzsRtx1fyqNla8Ua80DvCojCez24e6wt9vxCOFARy4Rx/W1Xskb/10Sziu3y QtQA== 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 c17-v6si17006009pgm.15.2018.09.10.08.04.38; Mon, 10 Sep 2018 08:04:38 -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 S1728698AbeIJT6t (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:49 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:46840 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728258AbeIJT6t (ORCPT ); Mon, 10 Sep 2018 15:58:49 -0400 Received: by mail-oi0-f67.google.com with SMTP id y207-v6so40669123oie.13; Mon, 10 Sep 2018 08:04:18 -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=Fm5qd4yMCoc0GeZFFp2Vsp5xyd6chz3tFRlJFQkPNCuUEJJ10h60NQjksVq/fUE9m/ SbHP/+CoR44Dv9zkY/1Nissa3U7aeLIkY7kjgUxN6kKIgeqjzdNMU7eY7nHaRxvYSAE4 iHLwBNQsx4M/8kA3RHTaKgHTjEjl6JfqtgzAvz6AVI8l5vgttCm/j/3daNG2a2v5vKyF IB309fhWeTWLJezBzezXlWgzj+HO75zEGZwkD+/tAF8Z7Y9+G6TIRVIFHDNFq0YCJg5v OYWHAHshhCcLwuDaddgcv6cx0olLjF4D6m2r1iR/5rZ1bpKzwAH7bVYiaguPKAIxuFtX rI4A== X-Gm-Message-State: APzg51C4Qrww33ZSiT7LzDFVkOEON21LZ7FglOQ3SsTkNMcfn8CTgbwL QOeu+5IA9WIJx5jxzwWTEoDMdEo= X-Received: by 2002:aca:bb0a:: with SMTP id l10-v6mr23915252oif.153.1536591857489; Mon, 10 Sep 2018 08:04:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:15 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org Subject: [PATCH v3 8/9] c6x: enable building all dtbs Date: Mon, 10 Sep 2018 10:04:02 -0500 Message-Id: <20180910150403.19476-9-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 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 Sep 10 15:04:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 146333 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2595497ljw; Mon, 10 Sep 2018 08:04:24 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ4TMHvU5Oz0Kf86M32BDHyKvn/GFcdCTQRfVN4UBU3knG1TvQpTdi+9bpvTvi5CcW1qFzr X-Received: by 2002:a63:6949:: with SMTP id e70-v6mr23182568pgc.119.1536591864444; Mon, 10 Sep 2018 08:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536591864; cv=none; d=google.com; s=arc-20160816; b=FN6Q5fV+z+AL/Fxg7AegwDHL0AENWKow2SI/Vwo2gCRy44g2qFeR0o1VnNEv0bsWw2 7f79k39Auc9qxEBTYMtuqRm9cEDZ5jJkVFQOjC6sWWOsKzsIXOKKAilJ3gLUz6qneSF/ ZkHmAwqw4wQDgikW8KIlY4V1GY6FNoX2KgdBJ9MmJvoBiZOaQflNb1reWQpsEgSHX1Bk Fj9k7Xm6a3YXz4v36SAbr7u58TAVnf/vtlLMT5qc0zZbUqHwf3FekgRArGeQSJfT+hIN xFHpCCkoOP4gYqD4/95FIDo0FpSwL1Mmd9Qrbjflu5JX/kvNz7PZoilgMTwr2TWzY8dj iNuA== 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=LvOnifchohhUMNgqcnWB8/j2PNcIKxLEa/K61YZZ+ahshiG4+4Ou8sMWg61UhX0Ltk ElKE2d2MZ92p9/mf6my29WnI+vTH3iPDUsfZv1xRhCNnbp+iyU6SLAjNoTsH3qXdwp52 O4G1xIFd3js9ApcfGwFPhuwYc9uLqnclJhsW3X7Ztv2m3SVjCWUJgR3os20qE9TmBwvh VyFPf/TuufsFB6Y4O3iTudydGXBK1mL/EP08CojZFtRDsHQjsgC2VUHWpoKkiPOF7qBN vOhILFtBoAP01NlCmEwu5/bXgPCCcN1Tax89y2H/W1bf4ILcVet17BynZDwPdEhaBmW1 BINw== 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 d68-v6si18974541pfj.311.2018.09.10.08.04.24; Mon, 10 Sep 2018 08:04:24 -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 S1728967AbeIJT6v (ORCPT + 32 others); Mon, 10 Sep 2018 15:58:51 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:40991 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbeIJT6u (ORCPT ); Mon, 10 Sep 2018 15:58:50 -0400 Received: by mail-oi0-f65.google.com with SMTP id k12-v6so40719462oiw.8; Mon, 10 Sep 2018 08:04:20 -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=uC/zUsKedaK/wF7V7qt5biDBmNyTdTgiQRSMTd5azteEcE/Dljc+SIYngfp0ju1dZJ 0qA9azoeyXQUqeBTNINYSlHBzqhibFM+ohXek7hExlPAKpKh6m89oeZniLcs29yw1T7j 0BxkL+JMUxBFD1Q1DIs2Yrncdzay5Jlfh40wgvTOSSX+iTkOP8EvY0plOoPGJGdkO9Ds 9wJvq3tojhlgwCs7gtRg72EU/6GcFGGCbviLS/HwVRgzMCyvK7iP1rlNajHHh5nVr4/C l44kqhayi8C1jBq+H6IavZaXcRztb8fHli0CyCuPYVvW5CUSIfqW+T199VL+MdtDdLvQ JjmQ== X-Gm-Message-State: APzg51AbouanDumw6gjV/1OkwrENnG1oMlDpDTKdqOFBrNqqZ2yC+XeW msfepqTl02edxamOOE88dEJ3k4w= X-Received: by 2002:aca:3110:: with SMTP id x16-v6mr23782576oix.126.1536591858924; Mon, 10 Sep 2018 08:04:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:04:17 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada Cc: Frank Rowand , Michal Simek Subject: [PATCH v3 9/9] microblaze: enable building all dtbs Date: Mon, 10 Sep 2018 10:04:03 -0500 Message-Id: <20180910150403.19476-10-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 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