devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Viresh Kumar <viresh.kumar@linaro.org>
To: Frank Rowand <frowand.list@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
	Masahiro Yamada <masahiroy@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	linux-kernel@vger.kernel.org, anmar.oueja@linaro.org,
	Bill Mills <bill.mills@linaro.org>,
	David Gibson <david@gibson.dropbear.id.au>,
	devicetree@vger.kernel.org,
	Michal Marek <michal.lkml@markovi.net>
Subject: [PATCH V6 6/6] of: unittest: Statically apply overlays using fdtoverlay
Date: Fri, 22 Jan 2021 16:20:36 +0530	[thread overview]
Message-ID: <58e8523e1489b70b76211fb94a9229ae12c33cad.1611312122.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1611312122.git.viresh.kumar@linaro.org>

Now that fdtoverlay is part of the kernel build, start using it to test
the unitest overlays we have by applying them statically. Create a new
base file static_base.dts which includes other .dtsi files.

Some unittest overlays deliberately contain errors that unittest checks
for. These overlays will cause fdtoverlay to fail, and are thus not
included in the static_test.dtb.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/of/unittest-data/Makefile        | 51 ++++++++++++++++++++++++
 drivers/of/unittest-data/static_base.dts |  5 +++
 2 files changed, 56 insertions(+)
 create mode 100644 drivers/of/unittest-data/static_base.dts

diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
index 009f4045c8e4..586fa8cda916 100644
--- a/drivers/of/unittest-data/Makefile
+++ b/drivers/of/unittest-data/Makefile
@@ -34,7 +34,58 @@ DTC_FLAGS_overlay += -@
 DTC_FLAGS_overlay_bad_phandle += -@
 DTC_FLAGS_overlay_bad_symbol += -@
 DTC_FLAGS_overlay_base += -@
+DTC_FLAGS_static_base += -@
 DTC_FLAGS_testcases += -@
 
 # suppress warnings about intentional errors
 DTC_FLAGS_testcases += -Wno-interrupts_property
+
+# Apply overlays statically with fdtoverlay.  This is a build time test that
+# the overlays can be applied successfully by fdtoverlay.  This does not
+# guarantee that the overlays can be applied successfully at run time by
+# unittest, but it provides a bit of build time test coverage for those
+# who do not execute unittest.
+#
+# The overlays are applied on top of static_base.dtb to create static_test.dtb
+# If fdtoverlay detects an error than the kernel build will fail.
+# static_test.dtb is not consumed by unittest.
+#
+# Some unittest overlays deliberately contain errors that unittest checks for.
+# These overlays will cause fdtoverlay to fail, and are thus not included
+# in the static test:
+#			overlay_bad_add_dup_node.dtb \
+#			overlay_bad_add_dup_prop.dtb \
+#			overlay_bad_phandle.dtb \
+#			overlay_bad_symbol.dtb \
+#			overlay_base.dtb \
+
+apply_static_overlay := overlay.dtb \
+			overlay_0.dtb \
+			overlay_1.dtb \
+			overlay_2.dtb \
+			overlay_3.dtb \
+			overlay_4.dtb \
+			overlay_5.dtb \
+			overlay_6.dtb \
+			overlay_7.dtb \
+			overlay_8.dtb \
+			overlay_9.dtb \
+			overlay_10.dtb \
+			overlay_11.dtb \
+			overlay_12.dtb \
+			overlay_13.dtb \
+			overlay_15.dtb \
+			overlay_gpio_01.dtb \
+			overlay_gpio_02a.dtb \
+			overlay_gpio_02b.dtb \
+			overlay_gpio_03.dtb \
+			overlay_gpio_04a.dtb \
+			overlay_gpio_04b.dtb
+
+quiet_cmd_fdtoverlay = FDTOVERLAY $@
+      cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $^
+
+$(obj)/static_test.dtb: $(obj)/static_base.dtb $(addprefix $(obj)/,$(apply_static_overlay))
+	$(call if_changed,fdtoverlay)
+
+always-$(CONFIG_OF_OVERLAY) += static_test.dtb
diff --git a/drivers/of/unittest-data/static_base.dts b/drivers/of/unittest-data/static_base.dts
new file mode 100644
index 000000000000..3c9af4aefb96
--- /dev/null
+++ b/drivers/of/unittest-data/static_base.dts
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "overlay_common.dtsi"
+#include "testcases_common.dtsi"
-- 
2.25.0.rc1.19.g042ed3e048af


  parent reply	other threads:[~2021-01-22 12:01 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-22 10:50 [PATCH V6 0/6] dt: build overlays Viresh Kumar
2021-01-22 10:50 ` [PATCH V6 1/6] scripts: dtc: Fetch fdtoverlay.c from external DTC project Viresh Kumar
2021-01-22 10:50 ` [PATCH V6 2/6] scripts: dtc: Build fdtoverlay tool Viresh Kumar
2021-01-23  0:35   ` David Gibson
2021-01-25  3:15     ` Viresh Kumar
2021-01-29  6:03   ` Frank Rowand
2021-01-29  6:11     ` Viresh Kumar
2021-01-22 10:50 ` [PATCH V6 3/6] scripts: dtc: Remove the unused fdtdump.c file Viresh Kumar
2021-01-22 10:50 ` [PATCH V6 4/6] kbuild: Add support to build overlays (%.dtbo) Viresh Kumar
2021-01-22 11:12   ` Masahiro Yamada
2021-01-22 10:50 ` [PATCH V6 5/6] of: unittest: Create overlay_common.dtsi and testcases_common.dtsi Viresh Kumar
2021-01-23  3:07   ` David Gibson
2021-01-25  3:16     ` Viresh Kumar
2021-01-26  3:18     ` Frank Rowand
2021-01-27  5:56   ` Viresh Kumar
2021-01-29  5:59     ` Frank Rowand
2021-01-29  6:39     ` Frank Rowand
2021-01-22 10:50 ` Viresh Kumar [this message]
2021-01-26  3:15   ` [PATCH V6 6/6] of: unittest: Statically apply overlays using fdtoverlay Frank Rowand
2021-01-26  3:21     ` Frank Rowand
2021-01-26  3:45 ` [PATCH V6 0/6] dt: build overlays Frank Rowand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=58e8523e1489b70b76211fb94a9229ae12c33cad.1611312122.git.viresh.kumar@linaro.org \
    --to=viresh.kumar@linaro.org \
    --cc=anmar.oueja@linaro.org \
    --cc=bill.mills@linaro.org \
    --cc=david@gibson.dropbear.id.au \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=michal.lkml@markovi.net \
    --cc=pantelis.antoniou@konsulko.com \
    --cc=robh+dt@kernel.org \
    --cc=vincent.guittot@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).