"Das U-Boot" Source Tree
cmd: Make use of U_BOOT_LONGHELP when missing
After adding the U_BOOT_LONGHELP macro some new commands came in still
that were not making use if it. Switch these cases over and in a few
places add missing newlines as well.
Signed-off-by: Tom Rini <trini@konsulko.com>
+40
-52
+2
-2
arch/arm/mach-imx/cmd_dek.c
+2
-2
arch/arm/mach-imx/cmd_dek.c
···
395
395
}
396
396
397
397
/***************************************************/
398
-
static char dek_blob_help_text[] =
398
+
U_BOOT_LONGHELP(dek_blob,
399
399
"src dst len - Encapsulate and create blob of data\n"
400
400
" $len bits long at address $src and\n"
401
-
" store the result at address $dst.\n";
401
+
" store the result at address $dst.\n");
402
402
403
403
U_BOOT_CMD(
404
404
dek_blob, 4, 1, do_dek_blob,
+2
-2
arch/arm/mach-imx/cmd_mfgprot.c
+2
-2
arch/arm/mach-imx/cmd_mfgprot.c
···
134
134
}
135
135
136
136
/***************************************************/
137
-
static char mfgprot_help_text[] =
137
+
U_BOOT_LONGHELP(mfgprot,
138
138
"Usage:\n"
139
139
"Print the public key for Manufacturing Protection\n"
140
140
"\tmfgprot pubk\n"
141
141
"Generates a Manufacturing Protection signature\n"
142
-
"\tmfgprot sign <data_addr> <size>";
142
+
"\tmfgprot sign <data_addr> <size>\n");
143
143
144
144
U_BOOT_CMD(
145
145
mfgprot, 4, 1, do_mfgprot,
+10
-10
arch/arm/mach-imx/imx8/snvs_security_sc.c
+10
-10
arch/arm/mach-imx/imx8/snvs_security_sc.c
···
597
597
}
598
598
#endif /* CONFIG_IMX_SNVS_SEC_SC_AUTO */
599
599
600
-
static char snvs_cfg_help_text[] =
600
+
U_BOOT_LONGHELP(snvs_cfg,
601
601
"snvs_cfg\n"
602
602
"\thp.lock\n"
603
603
"\thp.secvio_ctl\n"
···
618
618
"\tlp.act_tamper_routing_ctl1\n"
619
619
"\tlp.act_tamper_routing_ctl2\n"
620
620
"\n"
621
-
"ALL values should be in hexadecimal format";
621
+
"ALL values should be in hexadecimal format\n");
622
622
623
623
#define NB_REGISTERS 18
624
624
static int do_snvs_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
···
662
662
snvs_cfg_help_text
663
663
);
664
664
665
-
static char snvs_dgo_cfg_help_text[] =
665
+
U_BOOT_LONGHELP(snvs_dgo_cfg,
666
666
"snvs_dgo_cfg\n"
667
667
"\ttamper_offset_ctl\n"
668
668
"\ttamper_pull_ctl\n"
···
671
671
"\ttamper_misc_ctl\n"
672
672
"\ttamper_core_volt_mon_ctl\n"
673
673
"\n"
674
-
"ALL values should be in hexadecimal format";
674
+
"ALL values should be in hexadecimal format\n");
675
675
676
676
static int do_snvs_dgo_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
677
677
char *const argv[])
···
702
702
snvs_dgo_cfg_help_text
703
703
);
704
704
705
-
static char tamper_pin_cfg_help_text[] =
705
+
U_BOOT_LONGHELP(tamper_pin_cfg,
706
706
"snvs_dgo_cfg\n"
707
707
"\tpad\n"
708
708
"\tvalue\n"
709
709
"\n"
710
-
"ALL values should be in hexadecimal format";
710
+
"ALL values should be in hexadecimal format\n");
711
711
712
712
static int do_tamper_pin_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
713
713
char *const argv[])
···
734
734
tamper_pin_cfg_help_text
735
735
);
736
736
737
-
static char snvs_clear_status_help_text[] =
737
+
U_BOOT_LONGHELP(snvs_clear_status,
738
738
"snvs_clear_status\n"
739
739
"\tHPSR\n"
740
740
"\tHPSVSR\n"
···
742
742
"\tLPTDSR\n"
743
743
"\n"
744
744
"Write the status registers with the value provided,"
745
-
" clearing the status";
745
+
" clearing the status\n");
746
746
747
747
static int do_snvs_clear_status(struct cmd_tbl *cmdtp, int flag, int argc,
748
748
char *const argv[])
···
778
778
snvs_clear_status_help_text
779
779
);
780
780
781
-
static char snvs_sec_status_help_text[] =
781
+
U_BOOT_LONGHELP(snvs_sec_status,
782
782
"snvs_sec_status\n"
783
-
"Display information about the security related to tamper and secvio";
783
+
"Display information about the security related to tamper and secvio\n");
784
784
785
785
static int do_snvs_sec_status(struct cmd_tbl *cmdtp, int flag, int argc,
786
786
char *const argv[])
+2
-2
arch/arm/mach-stm32mp/cmd_stm32key.c
+2
-2
arch/arm/mach-stm32mp/cmd_stm32key.c
···
419
419
return CMD_RET_SUCCESS;
420
420
}
421
421
422
-
static char stm32key_help_text[] =
422
+
U_BOOT_LONGHELP(stm32key,
423
423
"list : list the supported key with description\n"
424
424
"stm32key select [<key>] : Select the key identified by <key> or display the key used for read/fuse command\n"
425
425
"stm32key read [<addr> | -a ] : Read the curent key at <addr> or current / all (-a) key in OTP\n"
426
426
"stm32key fuse [-y] <addr> : Fuse the current key at addr in OTP\n"
427
-
"stm32key close [-y] : Close the device\n";
427
+
"stm32key close [-y] : Close the device\n");
428
428
429
429
U_BOOT_CMD_WITH_SUBCMDS(stm32key, "Manage key on STM32", stm32key_help_text,
430
430
U_BOOT_SUBCMD_MKENT(list, 1, 0, do_stm32key_list),
+2
-3
board/amd/versal2/cmds.c
+2
-3
board/amd/versal2/cmds.c
···
71
71
return cmd_process_error(cmdtp, ret);
72
72
}
73
73
74
-
static char versal2_help_text[] =
74
+
U_BOOT_LONGHELP(versal2,
75
75
"loadpdi addr len - Load pdi image\n"
76
-
"load pdi image at ddr address 'addr' with pdi image size 'len'\n"
77
-
;
76
+
"load pdi image at ddr address 'addr' with pdi image size 'len'\n");
78
77
79
78
U_BOOT_CMD_WITH_SUBCMDS(versal2, "Versal Gen 2 sub-system", versal2_help_text,
80
79
U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,
+2
-2
board/freescale/common/cmd_esbc_validate.c
+2
-2
board/freescale/common/cmd_esbc_validate.c
···
63
63
}
64
64
65
65
/***************************************************/
66
-
static char esbc_validate_help_text[] =
66
+
U_BOOT_LONGHELP(esbc_validate,
67
67
"esbc_validate hdr_addr <hash_val> - Validates signature using\n"
68
68
" RSA verification\n"
69
69
" $hdr_addr Address of header of the image\n"
70
70
" to be validated.\n"
71
71
" $hash_val -Optional\n"
72
72
" It provides Hash of public/srk key to be\n"
73
-
" used to verify signature.\n";
73
+
" used to verify signature.\n");
74
74
75
75
U_BOOT_CMD(
76
76
esbc_validate, 3, 0, do_esbc_validate,
+2
-2
board/kontron/sl28/cmds.c
+2
-2
board/kontron/sl28/cmds.c
···
172
172
return CMD_RET_FAILURE;
173
173
}
174
174
175
-
static char sl28_help_text[] =
176
-
"nvm [<hex>] - display/set the 16 non-volatile bits\n";
175
+
U_BOOT_LONGHELP(sl28,
176
+
"nvm [<hex>] - display/set the 16 non-volatile bits\n");
177
177
178
178
U_BOOT_CMD_WITH_SUBCMDS(sl28, "SMARC-sAL28 specific", sl28_help_text,
179
179
U_BOOT_SUBCMD_MKENT(nvm, 2, 1, do_sl28_nvm));
+2
-3
board/xilinx/versal-net/cmds.c
+2
-3
board/xilinx/versal-net/cmds.c
···
71
71
return cmd_process_error(cmdtp, ret);
72
72
}
73
73
74
-
static char versalnet_help_text[] =
74
+
U_BOOT_LONGHELP(versalnet,
75
75
"loadpdi addr len - Load pdi image\n"
76
-
"load pdi image at ddr address 'addr' with pdi image size 'len'\n"
77
-
;
76
+
"load pdi image at ddr address 'addr' with pdi image size 'len'\n");
78
77
79
78
U_BOOT_CMD_WITH_SUBCMDS(versalnet, "Versal NET sub-system", versalnet_help_text,
80
79
U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,
+2
-2
cmd/adc.c
+2
-2
cmd/adc.c
···
152
152
return CMD_RET_SUCCESS;
153
153
}
154
154
155
-
static char adc_help_text[] =
155
+
U_BOOT_LONGHELP(adc,
156
156
"list - list ADC devices\n"
157
157
"adc info <name> - Get ADC device info\n"
158
158
"adc single <name> <channel> [varname] - Get Single data of ADC device channel\n"
159
-
"adc scan <name> [channel mask] - Scan all [or masked] ADC channels";
159
+
"adc scan <name> [channel mask] - Scan all [or masked] ADC channels\n");
160
160
161
161
U_BOOT_CMD_WITH_SUBCMDS(adc, "ADC sub-system", adc_help_text,
162
162
U_BOOT_SUBCMD_MKENT(list, 1, 1, do_adc_list),
+2
-3
cmd/arm/exception.c
+2
-3
cmd/arm/exception.c
···
49
49
"", ""),
50
50
};
51
51
52
-
static char exception_help_text[] =
52
+
U_BOOT_LONGHELP(exception,
53
53
"<ex>\n"
54
54
" The following exceptions are available:\n"
55
55
" breakpoint - prefetch abort\n"
56
56
" unaligned - data abort\n"
57
-
" undefined - undefined instruction\n"
58
-
;
57
+
" undefined - undefined instruction\n");
59
58
60
59
#include <exception.h>
+2
-3
cmd/arm/exception64.c
+2
-3
cmd/arm/exception64.c
···
77
77
"", ""),
78
78
};
79
79
80
-
static char exception_help_text[] =
80
+
U_BOOT_LONGHELP(exception,
81
81
"<ex>\n"
82
82
" The following exceptions are available:\n"
83
83
" breakpoint - breakpoint instruction exception\n"
84
84
" unaligned - unaligned LDAR data abort\n"
85
-
" undefined - undefined instruction exception\n"
86
-
;
85
+
" undefined - undefined instruction exception\n");
87
86
88
87
#include <exception.h>
+2
-2
cmd/blob.c
+2
-2
cmd/blob.c
···
99
99
}
100
100
101
101
/***************************************************/
102
-
static char blob_help_text[] =
102
+
U_BOOT_LONGHELP(blob,
103
103
"enc src dst len km - Encapsulate and create blob of data\n"
104
104
" $len bytes long at address $src and\n"
105
105
" store the result at address $dst.\n"
···
115
115
" modifier is stored.\n"
116
116
" The modifier is required for generation\n"
117
117
" /use as key for cryptographic operation.\n"
118
-
" Key modifier should be 16 byte long.\n";
118
+
" Key modifier should be 16 byte long.\n");
119
119
120
120
U_BOOT_CMD(
121
121
blob, 6, 1, do_blob,
+2
-7
cmd/cli.c
+2
-7
cmd/cli.c
···
118
118
return CMD_RET_USAGE;
119
119
}
120
120
121
-
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
122
-
static char cli_help_text[] =
121
+
U_BOOT_LONGHELP(cli,
123
122
"get - print current cli\n"
124
-
"set - set the current cli, possible value are: old, modern"
125
-
;
126
-
#endif
123
+
"set - set the current cli, possible value are: old, modern\n");
127
124
128
125
U_BOOT_CMD(cli, 3, 1, do_cli,
129
126
"cli",
130
-
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
131
127
cli_help_text
132
-
#endif
133
128
);
+2
-3
cmd/riscv/exception.c
+2
-3
cmd/riscv/exception.c
···
68
68
"", ""),
69
69
};
70
70
71
-
static char exception_help_text[] =
71
+
U_BOOT_LONGHELP(exception,
72
72
"<ex>\n"
73
73
" The following exceptions are available:\n"
74
74
" compressed - compressed instruction\n"
75
75
" ebreak - breakpoint\n"
76
76
" ialign16 - 16 bit aligned instruction\n"
77
77
" undefined - illegal instruction\n"
78
-
" unaligned - load address misaligned\n"
79
-
;
78
+
" unaligned - load address misaligned\n");
80
79
81
80
#include <exception.h>
+2
-3
cmd/scmi.c
+2
-3
cmd/scmi.c
···
369
369
return cp->cmd(cmdtp, flag, argc, argv);
370
370
}
371
371
372
-
static char scmi_help_text[] =
372
+
U_BOOT_LONGHELP(scmi,
373
373
" - SCMI utility\n"
374
374
" info - get the info of SCMI services\n"
375
375
" perm_dev <agent-id in hex> <device-id in hex> <flags in hex>\n"
···
377
377
" perm_proto <agent-id in hex> <device-id in hex> <protocol-id in hex> <flags in hex>\n"
378
378
" - set protocol permission to device\n"
379
379
" reset <agent-id in hex> <flags in hex>\n"
380
-
" - reset platform resource settings\n"
381
-
"";
380
+
" - reset platform resource settings\n");
382
381
383
382
U_BOOT_CMD(scmi, CONFIG_SYS_MAXARGS, 0, do_scmi, "SCMI utility",
384
383
scmi_help_text);
+2
-3
cmd/x86/exception.c
+2
-3
cmd/x86/exception.c
···
19
19
"", ""),
20
20
};
21
21
22
-
static char exception_help_text[] =
22
+
U_BOOT_LONGHELP(exception,
23
23
"<ex>\n"
24
24
" The following exceptions are available:\n"
25
-
" undefined - undefined instruction\n"
26
-
;
25
+
" undefined - undefined instruction\n");
27
26
28
27
#include <exception.h>