From: Quentin Schulz <[email protected]> Document the bdinfo -a, -e and -m options in the long help, but only when they can be used. The string concatenation is a bit odd with two newlines, but it does render properly once in U-Boot CLI.
Tested-by: Michal Simek <[email protected]> Signed-off-by: Quentin Schulz <[email protected]> --- cmd/bdinfo.c | 16 +++++++++++++++- test/cmd/bdinfo.c | 11 +++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 09fe8067642..f36c6123ca7 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -212,5 +212,19 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD( bdinfo, 2, 1, do_bdinfo, "print Board Info structure", - "" +// Long help prepended with command's name, and `bdinfo` is a valid command + "\n" +#if CONFIG_IS_ENABLED(GETOPT) + "bdinfo -a\n" +#endif + " - print all Board Info structure" +#if CONFIG_IS_ENABLED(GETOPT) + "\n" +#if IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP) + "bdinfo -e\n" + " - print Board Info related to network\n" +#endif + "bdinfo -m\n" + " - print Board Info related to DRAM" +#endif ); diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 2ba57edc685..5112c399931 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -254,6 +254,17 @@ static int bdinfo_test_help(struct unit_test_state *uts) ut_assert_nextline_empty(); ut_assert_nextlinen("Usage:"); ut_assert_nextlinen("bdinfo"); + if (CONFIG_IS_ENABLED(GETOPT)) + ut_assert_nextlinen("bdinfo -a"); + ut_assert_nextlinen(" - print all Board Info structure"); + if (CONFIG_IS_ENABLED(GETOPT)) { + if (IS_ENABLED(CONFIG_NET) || IS_ENABLED(CONFIG_NET_LWIP)) { + ut_assert_nextlinen("bdinfo -e"); + ut_assert_nextlinen(" - print Board Info related to network"); + } + ut_assert_nextlinen("bdinfo -m"); + ut_assert_nextlinen(" - print Board Info related to DRAM"); + } } ut_assert_console_end(); -- 2.52.0
