From: frowand.list@gmail.com
To: Viresh Kumar <viresh.kumar@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
pantelis.antoniou@konsulko.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kbuild@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Bill Mills <bill.mills@linaro.org>,
anmar.oueja@linaro.org, Masahiro Yamada <masahiroy@kernel.org>
Subject: re: [PATCH] of: unittest: Statically apply overlays using fdtoverlay
Date: Mon, 18 Jan 2021 20:21:54 -0600 [thread overview]
Message-ID: <20210119022154.2338781-1-frowand.list@gmail.com> (raw)
In-Reply-To: <1e42183ccafa1afba33b3e79a4e3efd3329fd133.1610095159.git.viresh.kumar@linaro.org>
From: Frank Rowand <frank.rowand@sony.com>
These changes apply on top of the patches in:
[PATCH] of: unittest: Statically apply overlays using fdtoverlay
Message-Id: <1e42183ccafa1afba33b3e79a4e3efd3329fd133.1610095159.git.viresh.kumar@linaro.org>
There are still some issues to be cleaned up, so not ready for acceptance.
I have not used the construct "always-$(CONFIG_OF_OVERLAY)" before, and
have not looked into the proper usage of it.
I tested this using a hand build libfdt and fdtoverlay from the dtc-compiler
upstream project. For my testing I added LD_LIBRARY_PATH to the body of
"cmd_fdtoverlay" to reference my hand built libfdt. The kernel build
system will have to instead use a libfdt that is built in the kernel
tree.
I have not run this through checkpatch, or my checks for build warnings.
I have not run unittests on my target with these patches applied.
---
drivers/of/unittest-data/Makefile | 67 ++++++++++++++++++++++---------
1 file changed, 48 insertions(+), 19 deletions(-)
diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
index f17bce85f65f..28614a123d1e 100644
--- a/drivers/of/unittest-data/Makefile
+++ b/drivers/of/unittest-data/Makefile
@@ -39,25 +39,54 @@ DTC_FLAGS_testcases += -@
# suppress warnings about intentional errors
DTC_FLAGS_testcases += -Wno-interrupts_property
-# Apply overlays statically with fdtoverlay
-intermediate-overlay := overlay.dtb
-master := 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 \
- intermediate-overlay.dtb
-
-quiet_cmd_fdtoverlay = fdtoverlay $@
- cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $^
-
-$(obj)/intermediate-overlay.dtb: $(obj)/overlay_base.dtb $(addprefix $(obj)/,$(intermediate-overlay))
- $(call if_changed,fdtoverlay)
+# 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 testcases.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.dtb \
+# overlay_bad_add_dup_node.dtb \
+# overlay_bad_add_dup_prop.dtb \
+# overlay_bad_phandle.dtb \
+# overlay_bad_symbol.dtb \
+
+apply_static_overlay := overlay_base.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 $@
+
+## This is not correct, need to use libfdt from the kernel tree:
+cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $^
-$(obj)/master.dtb: $(obj)/testcases.dtb $(addprefix $(obj)/,$(master))
+$(obj)/static_test.dtb: $(obj)/testcases.dtb $(addprefix $(obj)/,$(apply_static_overlay))
$(call if_changed,fdtoverlay)
-always-$(CONFIG_OF_OVERLAY) += intermediate-overlay.dtb master.dtb
+always-$(CONFIG_OF_OVERLAY) += static_test.dtb
--
Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2021-01-19 2:23 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 5:15 [PATCH V2 1/2] scripts: dtc: Add fdtoverlay.c and fdtdump.c to DTC_SOURCE Viresh Kumar
2021-01-07 5:15 ` [PATCH V2 2/2] scripts: dtc: Build fdtoverlay and fdtdump tools Viresh Kumar
2021-01-07 5:45 ` Masahiro Yamada
2021-01-07 6:25 ` [PATCH V3 " Viresh Kumar
2021-01-12 0:44 ` Frank Rowand
2021-01-12 5:08 ` Viresh Kumar
2021-01-12 18:34 ` Frank Rowand
2021-01-13 4:55 ` Viresh Kumar
2021-01-12 0:55 ` Frank Rowand
2021-01-12 4:48 ` Viresh Kumar
2021-01-19 16:28 ` [PATCH V2 " Frank Rowand
2021-01-19 16:34 ` Frank Rowand
2021-01-08 8:41 ` [PATCH] of: unittest: Statically apply overlays using fdtoverlay Viresh Kumar
2021-01-11 15:46 ` Rob Herring
2021-01-11 22:09 ` Frank Rowand
2021-01-14 5:03 ` Viresh Kumar
2021-01-14 15:01 ` Rob Herring
2021-01-15 5:44 ` Viresh Kumar
2021-01-18 3:54 ` Frank Rowand
2021-01-19 2:30 ` Frank Rowand
2021-01-18 6:30 ` David Gibson
2021-01-19 2:29 ` Frank Rowand
2021-01-11 22:06 ` Frank Rowand
2021-01-12 1:22 ` Bill Mills
2021-01-12 8:37 ` Viresh Kumar
2021-01-12 10:16 ` Bill Mills
2021-01-12 18:17 ` Frank Rowand
2021-01-12 14:04 ` Rob Herring
2021-01-12 19:06 ` Frank Rowand
2021-01-12 19:41 ` Rob Herring
2021-01-12 20:05 ` Frank Rowand
2021-01-12 20:46 ` Rob Herring
2021-01-13 2:20 ` Frank Rowand
2021-01-13 15:05 ` Rob Herring
2021-01-13 17:21 ` Frank Rowand
2021-01-14 5:00 ` Viresh Kumar
2021-01-19 2:25 ` Frank Rowand
2021-01-19 2:21 ` frowand.list [this message]
2021-01-19 8:05 ` Viresh Kumar
2021-01-19 15:44 ` Frank Rowand
2021-01-20 5:06 ` Viresh Kumar
2021-01-20 6:20 ` Viresh Kumar
2021-01-21 5:00 ` Frank Rowand
2021-01-21 5:09 ` Viresh Kumar
2021-01-21 6:41 ` David Gibson
2021-01-11 22:13 ` [PATCH V2 1/2] scripts: dtc: Add fdtoverlay.c and fdtdump.c to DTC_SOURCE Frank Rowand
2021-01-12 4:45 ` Viresh Kumar
2021-01-19 16:21 ` Frank Rowand
2021-01-19 16:31 ` 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=20210119022154.2338781-1-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=anmar.oueja@linaro.org \
--cc=bill.mills@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=pantelis.antoniou@konsulko.com \
--cc=robh+dt@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@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).