[PATCH v2 1/9] cmd: bdinfo: Optionally use getopt and implement bdinfo -a
Add optional support for getopt() and in case this is enabled via GETOPT configuration option, implement support for 'bdinfo -a'. The 'bdinfo -a' behaves exactly like bdinfo and prints 'all' the bdinfo information. This is implemented in preparation for other more fine-grained options.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- cmd/bdinfo.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 1fe13ca13a0..2c0d5e9c01b 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -10,6 +10,7 @@ #include <command.h> #include <dm.h> #include <env.h> +#include <getopt.h> #include <lmb.h> #include <mapmem.h> #include <net.h> @@ -133,10 +134,8 @@ static void print_serial(struct udevice *dev) bdinfo_print_num_l(" clock", info.clock); }
-int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +static int bdinfo_print_all(struct bd_info *bd) { - struct bd_info *bd = gd->bd; - #ifdef DEBUG bdinfo_print_num_l("bd address", (ulong)bd); #endif @@ -184,8 +183,30 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return 0; }
+int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + struct bd_info *bd = gd->bd; + struct getopt_state gs; + int opt; + + if (!CONFIG_IS_ENABLED(GETOPT) || argc == 1) + return bdinfo_print_all(bd); + + getopt_init_state(&gs); + while ((opt = getopt(&gs, argc, argv, "a")) > 0) { + switch (opt) { + case 'a': + return bdinfo_print_all(bd); + default: + return CMD_RET_USAGE; + } + } + + return CMD_RET_USAGE; +} + U_BOOT_CMD( - bdinfo, 1, 1, do_bdinfo, + bdinfo, 2, 1, do_bdinfo, "print Board Info structure", "" );
Add support for printing memory layout only via 'bdinfo -m' .
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- cmd/bdinfo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 2c0d5e9c01b..c720ee6f9b6 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -193,10 +193,13 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return bdinfo_print_all(bd);
getopt_init_state(&gs); - while ((opt = getopt(&gs, argc, argv, "a")) > 0) { + while ((opt = getopt(&gs, argc, argv, "am")) > 0) { switch (opt) { case 'a': return bdinfo_print_all(bd); + case 'm': + print_bi_dram(bd); + return CMD_RET_SUCCESS; default: return CMD_RET_USAGE; }
Add support for printing ethernet settings only via 'bdinfo -e' .
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- cmd/bdinfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index c720ee6f9b6..79106caeec2 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -193,10 +193,15 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return bdinfo_print_all(bd);
getopt_init_state(&gs); - while ((opt = getopt(&gs, argc, argv, "am")) > 0) { + while ((opt = getopt(&gs, argc, argv, "aem")) > 0) { switch (opt) { case 'a': return bdinfo_print_all(bd); + case 'e': + if (!IS_ENABLED(CONFIG_CMD_NET)) + return CMD_RET_USAGE; + print_eth(); + return CMD_RET_SUCCESS; case 'm': print_bi_dram(bd); return CMD_RET_SUCCESS;
Enable GETOPT so that 'bdinfo' command with getopt() support can be tested in CI.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + 2 files changed, 2 insertions(+)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 1a033b22018..e937ac66964 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -262,6 +262,7 @@ CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_LZ4=y CONFIG_ERRNO_STR=y +CONFIG_GETOPT=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 01830c7bd25..019e41580c1 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -338,6 +338,7 @@ CONFIG_ECDSA_VERIFY=y CONFIG_TPM=y CONFIG_SHA384=y CONFIG_ERRNO_STR=y +CONFIG_GETOPT=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
Rename bdinfo_test_move() to bdinfo_test_full(). The former is a remnant of deriving this test from another test. No functional change.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- test/cmd/bdinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 8c09281cac0..b2896e8eb41 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,7 +130,7 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; }
-static int bdinfo_test_move(struct unit_test_state *uts) +static int bdinfo_test_full(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i; @@ -217,7 +217,7 @@ static int bdinfo_test_move(struct unit_test_state *uts) return 0; }
-BDINFO_TEST(bdinfo_test_move, UT_TESTF_CONSOLE_REC); +BDINFO_TEST(bdinfo_test_full, UT_TESTF_CONSOLE_REC);
int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) {
Factor out the core of test for all bdinfo output into bdinfo_test_all() and then reuse it to verify that both 'bdinfo' and 'bdinfo -a' print all the bdinfo output.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- test/cmd/bdinfo.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index b2896e8eb41..509a8b5c586 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,15 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; }
-static int bdinfo_test_full(struct unit_test_state *uts) +static int bdinfo_test_all(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i;
- /* Test moving the working BDINFO to a new location */ - ut_assertok(console_record_reset_enable()); - ut_assertok(run_commandf("bdinfo")); - ut_assertok(test_num_l(uts, "boot_params", 0));
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { @@ -212,6 +208,17 @@ static int bdinfo_test_full(struct unit_test_state *uts) ut_assertok(test_num_l(uts, "malloc base", gd_malloc_start())); }
+ return 0; +} + +static int bdinfo_test_full(struct unit_test_state *uts) +{ + /* Test BDINFO full print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo")); + ut_assertok(bdinfo_test_all(uts)); + ut_assertok(run_commandf("bdinfo -a")); + ut_assertok(bdinfo_test_all(uts)); ut_assertok(ut_check_console_end(uts));
return 0;
The bdinfo -h should print error message that -h is an unknown parameter and then command help text. Test the expected output.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- test/cmd/bdinfo.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 509a8b5c586..2f34d877e5c 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -226,6 +226,23 @@ static int bdinfo_test_full(struct unit_test_state *uts)
BDINFO_TEST(bdinfo_test_full, UT_TESTF_CONSOLE_REC);
+static int bdinfo_test_help(struct unit_test_state *uts) +{ + /* Test BDINFO unknown option help text print */ + ut_assertok(console_record_reset_enable()); + ut_asserteq(1, run_commandf("bdinfo -h")); + ut_assert_nextlinen("bdinfo: invalid option -- h"); + ut_assert_nextlinen("bdinfo - print Board Info structure"); + ut_assert_nextline_empty(); + ut_assert_nextlinen("Usage:"); + ut_assert_nextlinen("bdinfo"); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_help, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test);
The bdinfo -m should print only the board memory layout. Test the expected output.
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Rename bdinfo_test_mem() to bdinfo_check_mem() --- test/cmd/bdinfo.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 2f34d877e5c..c9be182e370 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,13 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; }
-static int bdinfo_test_all(struct unit_test_state *uts) +static int bdinfo_check_mem(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i;
- ut_assertok(test_num_l(uts, "boot_params", 0)); - for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { if (bd->bi_dram[i].size) { ut_assertok(test_num_l(uts, "DRAM bank", i)); @@ -147,6 +145,15 @@ static int bdinfo_test_all(struct unit_test_state *uts) } }
+ return 0; +} + +static int bdinfo_test_all(struct unit_test_state *uts) +{ + ut_assertok(test_num_l(uts, "boot_params", 0)); + + ut_assertok(bdinfo_check_mem(uts)); + /* CONFIG_SYS_HAS_SRAM testing not supported */ ut_assertok(test_num_l(uts, "flashstart", 0)); ut_assertok(test_num_l(uts, "flashsize", 0)); @@ -243,6 +250,19 @@ static int bdinfo_test_help(struct unit_test_state *uts)
BDINFO_TEST(bdinfo_test_help, UT_TESTF_CONSOLE_REC);
+static int bdinfo_test_memory(struct unit_test_state *uts) +{ + /* Test BDINFO memory layout only print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo -m")); + ut_assertok(bdinfo_check_mem(uts)); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_memory, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test);
On Sat, 7 Oct 2023 at 15:41, Marek Vasut marek.vasut+renesas@mailbox.org wrote:
The bdinfo -m should print only the board memory layout. Test the expected output.
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org
Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org
V2: Rename bdinfo_test_mem() to bdinfo_check_mem()
test/cmd/bdinfo.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
The bdinfo -e should print only the board ethernet settings. Test the expected output.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org --- V2: Add RB from Simon --- test/cmd/bdinfo.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index c9be182e370..9744bd16df9 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -263,6 +263,20 @@ static int bdinfo_test_memory(struct unit_test_state *uts)
BDINFO_TEST(bdinfo_test_memory, UT_TESTF_CONSOLE_REC);
+static int bdinfo_test_eth(struct unit_test_state *uts) +{ + /* Test BDINFO ethernet settings only print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo -e")); + if (IS_ENABLED(CONFIG_CMD_NET)) + ut_assertok(test_eth(uts)); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_eth, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test);
On 10/7/23 23:40, Marek Vasut wrote:
Add optional support for getopt() and in case this is enabled via GETOPT configuration option, implement support for 'bdinfo -a'. The 'bdinfo -a' behaves exactly like bdinfo and prints 'all' the bdinfo information. This is implemented in preparation for other more fine-grained options.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org
Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org
V2: Add RB from Simon
I see this series marked as Superseded in patchwork , why is that so ?
Is there anything preventing this series from being applied , Tom ?
On Sat, Dec 02, 2023 at 05:33:34PM +0100, Marek Vasut wrote:
On 10/7/23 23:40, Marek Vasut wrote:
Add optional support for getopt() and in case this is enabled via GETOPT configuration option, implement support for 'bdinfo -a'. The 'bdinfo -a' behaves exactly like bdinfo and prints 'all' the bdinfo information. This is implemented in preparation for other more fine-grained options.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org
Cc: Bin Meng bmeng.cn@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Nikhil M Jain n-jain1@ti.com Cc: Simon Glass sjg@chromium.org
V2: Add RB from Simon
I see this series marked as Superseded in patchwork , why is that so ?
Is there anything preventing this series from being applied , Tom ?
Dunno why I did that, sorry. Reviewing now.
On Sat, 07 Oct 2023 23:40:58 +0200, Marek Vasut wrote:
Add optional support for getopt() and in case this is enabled via GETOPT configuration option, implement support for 'bdinfo -a'. The 'bdinfo -a' behaves exactly like bdinfo and prints 'all' the bdinfo information. This is implemented in preparation for other more fine-grained options.
[...]
Applied to u-boot/next, thanks!
participants (4)
-
Marek Vasut -
Marek Vasut -
Simon Glass -
Tom Rini