From patchwork Fri Oct 5 16:58:19 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: 148264 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp692674lji; Fri, 5 Oct 2018 10:02:18 -0700 (PDT) X-Google-Smtp-Source: ACcGV60Q/WMCiSTdJ7b+68NUakclkC0PQC6fgapGxBAcO2J0RLLyaADX9kBj5PavV/jLa1DmV5EU X-Received: by 2002:a63:ae4d:: with SMTP id e13-v6mr11041302pgp.315.1538758937968; Fri, 05 Oct 2018 10:02:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538758937; cv=none; d=google.com; s=arc-20160816; b=chDui/R5257M0uQi1f3LL+foswi7uRpzSryyX6Ibwn5u9+CdncBU6HEoCxoPuAiG/U eygTBHf+2Q3K8tZ5pIHUH+fN+GRm3pHJdzh/r48Zd4YIHInCbBc6WwX9N2L63O2QqXaR k00U+gbjT1/0sVxn3SfCRAmeNb45322vhjxXVp20Qz6fJPovGYg0Tjpa3B0lQrBfUuDv On+qFeM3iW+JWRyBREsuCgiGtkqy2taygfYdgH5489EE9hdZ4cPDFrO8DKI89d6Rrl1F ab9LZquEkjhMRHOnxgpsjyhNrszFO7U2jfCyiCfH94cqg9Lo/pCaW/CdXE3d/XuWdFi6 ebMQ== 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=XljLqX9eXIuRQosUM4KeYlmmSjpyha1rYixAv1GAi7w=; b=xhTayYnL8GXMKJG7M5jG5ojIkyk5/3kDZkATaFmvn7opaJ6ZiaaXfPgbUrjL+nV4rJ 4PeYaonMOdIeN4VKdTq+MjVyx0I/qAEOhgQkbUEZN84BgbKH2QWJyUJeB/QppGyfVy0e o4EwrzPdHcFB4pzS/PK/DGDKnT/rBRgLGOpbJn/c4P92RRjTMgxoK8bnDDLujEvDncKk pNgXEoPA+YHeuA8/GYE2/2VYs3ppBTCvWHKQxR4XV9Ceti9j3ELlvKwP4lMmc87MzUvr /xYnFXBf6ecq+I2rrn1DBsqWTEyqkBXZ3xf9Oiqv0T5xQ3s6VOQEKGtEjlGs4z6/75Xr dhKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 h25-v6si9146627pgn.567.2018.10.05.10.02.17; Fri, 05 Oct 2018 10:02:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1729066AbeJEX6f (ORCPT + 6 others); Fri, 5 Oct 2018 19:58:35 -0400 Received: from mail-ot1-f65.google.com ([209.85.210.65]:45292 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729025AbeJEX6e (ORCPT ); Fri, 5 Oct 2018 19:58:34 -0400 Received: by mail-ot1-f65.google.com with SMTP id u22so13319911ota.12; Fri, 05 Oct 2018 09:59:00 -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=XljLqX9eXIuRQosUM4KeYlmmSjpyha1rYixAv1GAi7w=; b=r24DWzeFYwRTkESPr88ylKRYmTGpJTkBPL35QWTykWQDw9ilqw0V0r7BzXfZUM/jme l5kSxbTocGyIIHzC+jK2ZD0j8aPcFmcFOEVRkBK2tj8itRAYwbMDsGjo4+DU2/PNcXQh XSVB/rjyfTCmUbEmidJwoTv+F9+5Eyzk0JvICBCpXOc0w/LTbTZGTe7jFauKT5E/ab3n UZMQ8wNtrTh+cdP4QgbNrXOhgJ2GC+a+Z9ztS1eKuGoA6kPXBAjC8jZEH7bxtrs8qviF Fvk191YSdQD+AJTy0JDaSw3jf+H/2yU1Ht5yrkWK+ul2U7d2IQMiMoLxNQK9nTSkrqQw 2wpQ== X-Gm-Message-State: ABuFfoggLUTFaVSX2TkBcN7u4uJm6MtS+ORDawDOSDveJOIdRAvi8U0o 9LHBkpRC4Tzb5PomfIDELjqPzAvJDQ== X-Received: by 2002:a9d:308d:: with SMTP id s13mr7263505otc.359.1538758739965; Fri, 05 Oct 2018 09:58:59 -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 u63-v6sm2904328ota.75.2018.10.05.09.58.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 09:58:59 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org Cc: Grant Likely , Kumar Gala , Frank Rowand , Mark Rutland , Linus Walleij , Olof Johansson , Arnd Bergmann , Mark Brown , Tom Rini , Pantelis Antoniou , Geert Uytterhoeven , Jonathan Cameron , Bjorn Andersson , Jonathan Corbet , Masahiro Yamada , Michal Marek , linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH 07/36] kbuild: Add support for DT binding schema checks Date: Fri, 5 Oct 2018 11:58:19 -0500 Message-Id: <20181005165848.3474-8-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181005165848.3474-1-robh@kernel.org> References: <20181005165848.3474-1-robh@kernel.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This adds the build infrastructure for checking DT binding schema documents and validating dts files using the binding schema. Check DT binding schema documents: make dt_binding_check Build dts files and check using DT binding schema: make dtbs_check Currently, the validation targets are separate from a normal build to avoid a hard dependency on the external DT schema project and because there are lots of warnings generated. Cc: Jonathan Corbet Cc: Mark Rutland Cc: Masahiro Yamada Cc: Michal Marek Cc: linux-doc@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-kbuild@vger.kernel.org Signed-off-by: Rob Herring --- .gitignore | 1 + Documentation/Makefile | 2 +- Documentation/devicetree/bindings/.gitignore | 2 ++ Documentation/devicetree/bindings/Makefile | 30 ++++++++++++++++++++ Makefile | 8 +++++- scripts/Makefile.lib | 24 ++++++++++++++-- 6 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/.gitignore create mode 100644 Documentation/devicetree/bindings/Makefile -- 2.17.1 diff --git a/.gitignore b/.gitignore index 97ba6b79834c..a20ac26aa2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *.bin *.bz2 *.c.[012]*.* +*.dt.yaml *.dtb *.dtb.S *.dwo diff --git a/Documentation/Makefile b/Documentation/Makefile index 2ca77ad0f238..9786957c6a35 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -2,7 +2,7 @@ # Makefile for Sphinx documentation # -subdir-y := +subdir-y := devicetree/bindings/ # You can set these variables from the command line. SPHINXBUILD = sphinx-build diff --git a/Documentation/devicetree/bindings/.gitignore b/Documentation/devicetree/bindings/.gitignore new file mode 100644 index 000000000000..7e47316f1d7a --- /dev/null +++ b/Documentation/devicetree/bindings/.gitignore @@ -0,0 +1,2 @@ +*.example.dts +*.yaml.tmp diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile new file mode 100644 index 000000000000..b57f0dec3fab --- /dev/null +++ b/Documentation/devicetree/bindings/Makefile @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0 +DT_DOC_CHECKER ?= dt-doc-validate +DT_EXTRACT_EX ?= dt-extract-example + +quiet_cmd_chk_binding = CHKDT $< + cmd_chk_binding = (set -e; \ + $(DT_DOC_CHECKER) $< ; \ + mkdir -p $(dir $@) ; \ + $(DT_EXTRACT_EX) $< > $@ ) + +$(obj)/%.example.dts: $(src)/%.yaml FORCE + $(call if_changed,chk_binding) + +DT_MK_SCHEMA ?= dt-mk-schema +DT_TMP_SCHEMA := .schema.yaml.tmp +extra-y += $(DT_TMP_SCHEMA) + +quiet_cmd_mk_schema = SCHEMA $@ + cmd_mk_schema = mkdir -p $(obj); \ + $(DT_MK_SCHEMA) -o $@ $(srctree)/$(src) + +DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml') +DTS_EXAMPLES = $(patsubst %.yaml,%.example.dts, $(DT_DOCS)) +extra-y += $(DTS_EXAMPLES) + +DTBS = $(patsubst %.yaml,%.example.dtb, $(DT_DOCS)) +extra-y += $(DTBS) + +$(obj)/$(DT_TMP_SCHEMA): $(addprefix $(obj)/, $(DTBS)) FORCE + $(call if_changed,mk_schema) diff --git a/Makefile b/Makefile index 021e274c4b03..648f7238e883 100644 --- a/Makefile +++ b/Makefile @@ -1227,10 +1227,13 @@ ifneq ($(dtstree),) %.dtb: prepare3 scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ -PHONY += dtbs dtbs_install +PHONY += dtbs dtbs_install dt_binding_check dtbs: prepare3 scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) +dtbs_check: prepare3 dt_binding_check + $(Q)$(MAKE) $(build)=$(dtstree) CHECK_DTBS=1 + dtbs_install: $(Q)$(MAKE) $(dtbinst)=$(dtstree) @@ -1244,6 +1247,9 @@ PHONY += scripts_dtc scripts_dtc: scripts_basic $(Q)$(MAKE) $(build)=scripts/dtc +dt_binding_check: scripts_dtc + $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings + # --------------------------------------------------------------------------- # Modules diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8fe4468f9bda..d1c5630ba24c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -61,6 +61,11 @@ real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) extra-y += $(dtb-y) extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) +ifneq ($(CHECK_DTBS),) +extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) +extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) +endif + # Add subdir path extra-y := $(addprefix $(obj)/,$(extra-y)) @@ -284,13 +289,28 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(DTC) -O dtb -o $@ -b 0 \ + $(DTC) -O $(2) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE - $(call if_changed_dep,dtc) + $(call if_changed_dep,dtc,dtb) + +DT_CHECKER ?= dt-validate +DT_BINDING_DIR := Documentation/devicetree/bindings +DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/.schema.yaml.tmp + +quiet_cmd_dtb_check = CHECK $@ + cmd_dtb_check = $(DT_CHECKER) -p $(DT_TMP_SCHEMA) $@ ; + +define rule_dtc_dt_yaml + $(call cmd_and_fixdep,dtc,yaml) \ + $(call echo-cmd,dtb_check) $(cmd_dtb_check) +endef + +$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE + $(call if_changed_rule,dtc_dt_yaml) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)