summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPeter Hoyes <Peter.Hoyes@arm.com>2023-03-21 13:01:16 +0000
committerSimon Glass <sjg@chromium.org>2023-04-03 06:53:53 +1200
commitb4fae89c48b9a8c868c5b5f63af2d6737a54621e (patch)
tree924f8f6ba9c5f382a9da17a5391a20b7410f9cd9 /test
parentd0bb00adccb8fb5187b49193127729d591ebd206 (diff)
downloadu-boot-b4fae89c48b9a8c868c5b5f63af2d6737a54621e.tar.gz
fdt: Make fdt addr -q quieter
64597346 "fdt: Add -q option to fdt addr for distro_bootcmd" introduced the -q option for fdt addr, which sets the current working fdt address without printing any output. baf41410 "fdt: Show a message when the working FDT changes" made the utility function set_working_fdt_addr (in cmd/fdt.c) output a message on each invocation, even if called via fdt addr -q, in which case its output is now slightly noisier. To fix this, split out set_working_fdt_addr into set_working_fdt_addr plus the static function set_working_fdt_addr_quiet. set_working_fdt_addr_quiet can be called by "quiet" fdt cmd logic and set_working_fdt_addr is exported (as before) to other boot logic. The latter calls the former. Remove the assertion from the fdt addr test case when calling with the -q argument. Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com> Reviewed-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
-rw-r--r--test/cmd/fdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c
index 597fecbf62..7835da232d 100644
--- a/test/cmd/fdt.c
+++ b/test/cmd/fdt.c
@@ -236,7 +236,6 @@ static int fdt_test_addr_resize(struct unit_test_state *uts)
/* ...quietly */
ut_assertok(run_commandf("fdt addr -q %08lx %zx", addr, sizeof(fdt) / 4));
- ut_assert_nextline("Working FDT set to %lx", addr);
ut_assertok(ut_check_console_end(uts));
/* We cannot easily provoke errors in fdt_open_into(), so ignore that */