út 31. 5. 2022 v 20:14 odesílatel Ovidiu Panait ovpanait@gmail.com napsal:
Migrate cpu command to use U_BOOT_CMD_WITH_SUBCMDS() helper macro, to reduce duplicated code. This also fixes the cpu command on boards that enable CONFIG_NEEDS_MANUAL_RELOC.
Signed-off-by: Ovidiu Panait ovpanait@gmail.com
NOTE: this series depends on the following "events" patch: https://lore.kernel.org/u-boot/20220515184029.2169025-2-ovpanait@gmail.com/
Changes in v2:
- New patch.
cmd/cpu.c | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/cmd/cpu.c b/cmd/cpu.c index 67dbb044b5..2ca4d05ae8 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -82,36 +82,13 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc, return 0; }
-static struct cmd_tbl cmd_cpu_sub[] = {
U_BOOT_CMD_MKENT(list, 2, 1, do_cpu_list, "", ""),U_BOOT_CMD_MKENT(detail, 4, 0, do_cpu_detail, "", ""),-};
-/*
- Process a cpu sub-command
- */
-static int do_cpu(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])-{
struct cmd_tbl *c = NULL;/* Strip off leading 'cpu' command argument */argc--;argv++;if (argc)c = find_cmd_tbl(argv[0], cmd_cpu_sub,ARRAY_SIZE(cmd_cpu_sub));if (c)return c->cmd(cmdtp, flag, argc, argv);elsereturn CMD_RET_USAGE;-}
-U_BOOT_CMD(
cpu, 2, 1, do_cpu,"display information about CPUs",+#if CONFIG_IS_ENABLED(SYS_LONGHELP) +static char cpu_help_text[] = "list - list available CPUs\n" "cpu detail - show CPU detail" -);
;+#endif
+U_BOOT_CMD_WITH_SUBCMDS(cpu, "display information about CPUs", cpu_help_text,
U_BOOT_SUBCMD_MKENT(list, 1, 1, do_cpu_list),U_BOOT_SUBCMD_MKENT(detail, 1, 0, do_cpu_detail));-- 2.25.1
From my point of view this series looks good. I have sent v2 of mb
conversion rela and I prefer to apply this on the top. There is actually one change needed bralid/brlid in one patch but I have already did it and test it on the HW. Will queue for the next u-boot version.
Thanks, Michal