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>

diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index c7962ead2d54c565854077ae8988e8ad9b300a7a..56e1a8f8be7650615a0c2a8368de42a3c9febd64 100644 (file)
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -395,10 +395,10 @@ static int do_dek_blob(struct cmd_tbl *cmdtp, int flag, int argc,
 }
 
 /***************************************************/
-static char dek_blob_help_text[] =
+U_BOOT_LONGHELP(dek_blob,
        "src dst len            - Encapsulate and create blob of data\n"
        "                         $len bits long at address $src and\n"
-       "                         store the result at address $dst.\n";
+       "                         store the result at address $dst.\n");
 
 U_BOOT_CMD(
        dek_blob, 4, 1, do_dek_blob,

diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c
index 9925c9922687e47e441cb109b35a3dac47856f66..9f37e611a1e7d44928e8c2beb65e518740cd2280 100644 (file)
--- a/arch/arm/mach-imx/cmd_mfgprot.c
+++ b/arch/arm/mach-imx/cmd_mfgprot.c
@@ -134,12 +134,12 @@ free_m:
 }
 
 /***************************************************/
-static char mfgprot_help_text[] =
+U_BOOT_LONGHELP(mfgprot,
        "Usage:\n"
         "Print the public key for Manufacturing Protection\n"
         "\tmfgprot pubk\n"
         "Generates a Manufacturing Protection signature\n"
-        "\tmfgprot sign <data_addr> <size>";
+        "\tmfgprot sign <data_addr> <size>\n");
 
 U_BOOT_CMD(
        mfgprot, 4, 1, do_mfgprot,

diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index f13dfc1551652afa4cf969a48b71c96f1c086974..df8c22b5706366e2fe639f721136df6169116aba 100644 (file)
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -597,7 +597,7 @@ exit:
 }
 #endif /* CONFIG_IMX_SNVS_SEC_SC_AUTO */
 
-static char snvs_cfg_help_text[] =
+U_BOOT_LONGHELP(snvs_cfg,
        "snvs_cfg\n"
        "\thp.lock\n"
        "\thp.secvio_ctl\n"
@@ -618,7 +618,7 @@ static char snvs_cfg_help_text[] =
        "\tlp.act_tamper_routing_ctl1\n"
        "\tlp.act_tamper_routing_ctl2\n"
        "\n"
-       "ALL values should be in hexadecimal format";
+       "ALL values should be in hexadecimal format\n");
 
 #define NB_REGISTERS 18
 static int do_snvs_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -662,7 +662,7 @@ U_BOOT_CMD(snvs_cfg,
           snvs_cfg_help_text
 );
 
-static char snvs_dgo_cfg_help_text[] =
+U_BOOT_LONGHELP(snvs_dgo_cfg,
        "snvs_dgo_cfg\n"
        "\ttamper_offset_ctl\n"
        "\ttamper_pull_ctl\n"
@@ -671,7 +671,7 @@ static char snvs_dgo_cfg_help_text[] =
        "\ttamper_misc_ctl\n"
        "\ttamper_core_volt_mon_ctl\n"
        "\n"
-       "ALL values should be in hexadecimal format";
+       "ALL values should be in hexadecimal format\n");
 
 static int do_snvs_dgo_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
                           char *const argv[])
@@ -702,12 +702,12 @@ U_BOOT_CMD(snvs_dgo_cfg,
           snvs_dgo_cfg_help_text
 );
 
-static char tamper_pin_cfg_help_text[] =
+U_BOOT_LONGHELP(tamper_pin_cfg,
        "snvs_dgo_cfg\n"
        "\tpad\n"
        "\tvalue\n"
        "\n"
-       "ALL values should be in hexadecimal format";
+       "ALL values should be in hexadecimal format\n");
 
 static int do_tamper_pin_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
                             char *const argv[])
@@ -734,7 +734,7 @@ U_BOOT_CMD(tamper_pin_cfg,
           tamper_pin_cfg_help_text
 );
 
-static char snvs_clear_status_help_text[] =
+U_BOOT_LONGHELP(snvs_clear_status,
        "snvs_clear_status\n"
        "\tHPSR\n"
        "\tHPSVSR\n"
@@ -742,7 +742,7 @@ static char snvs_clear_status_help_text[] =
        "\tLPTDSR\n"
        "\n"
        "Write the status registers with the value provided,"
-       " clearing the status";
+       " clearing the status\n");
 
 static int do_snvs_clear_status(struct cmd_tbl *cmdtp, int flag, int argc,
                                char *const argv[])
@@ -778,9 +778,9 @@ U_BOOT_CMD(snvs_clear_status,
           snvs_clear_status_help_text
 );
 
-static char snvs_sec_status_help_text[] =
+U_BOOT_LONGHELP(snvs_sec_status,
        "snvs_sec_status\n"
-       "Display information about the security related to tamper and secvio";
+       "Display information about the security related to tamper and secvio\n");
 
 static int do_snvs_sec_status(struct cmd_tbl *cmdtp, int flag, int argc,
                              char *const argv[])

diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index 0cb3c7a9fa440c07cc9cda12d21e61bf043d78cb..040a70f581cbfa220ade64c9e9f1ab02c143c185 100644 (file)
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -419,12 +419,12 @@ static int do_stm32key_close(struct cmd_tbl *cmdtp, int flag, int argc, char *co
        return CMD_RET_SUCCESS;
 }
 
-static char stm32key_help_text[] =
+U_BOOT_LONGHELP(stm32key,
        "list : list the supported key with description\n"
        "stm32key select [<key>] : Select the key identified by <key> or display the key used for read/fuse command\n"
        "stm32key read [<addr> | -a ] : Read the curent key at <addr> or current / all (-a) key in OTP\n"
        "stm32key fuse [-y] <addr> : Fuse the current key at addr in OTP\n"
-       "stm32key close [-y] : Close the device\n";
+       "stm32key close [-y] : Close the device\n");
 
 U_BOOT_CMD_WITH_SUBCMDS(stm32key, "Manage key on STM32", stm32key_help_text,
        U_BOOT_SUBCMD_MKENT(list, 1, 0, do_stm32key_list),

diff --git a/board/amd/versal2/cmds.c b/board/amd/versal2/cmds.c
index fbd99918a7f4386ba4545f3d4067283f66a56967..56ae39bc6a1eb5e1ae6f57c316e65f007d44bb67 100644 (file)
--- a/board/amd/versal2/cmds.c
+++ b/board/amd/versal2/cmds.c
@@ -71,10 +71,9 @@ static int do_versal2_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc,
        return cmd_process_error(cmdtp, ret);
 }
 
-static char versal2_help_text[] =
+U_BOOT_LONGHELP(versal2,
        "loadpdi addr len - Load pdi image\n"
-       "load pdi image at ddr address 'addr' with pdi image size 'len'\n"
-;
+       "load pdi image at ddr address 'addr' with pdi image size 'len'\n");
 
 U_BOOT_CMD_WITH_SUBCMDS(versal2, "Versal Gen 2 sub-system", versal2_help_text,
                        U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,

diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index d4192e5ab5218efde0f33728da0bbcbfdf3c9add..3344653ba2da2674f1b1264e8bdc36d88173095b 100644 (file)
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -63,14 +63,14 @@ static int do_esbc_validate(struct cmd_tbl *cmdtp, int flag, int argc,
 }
 
 /***************************************************/
-static char esbc_validate_help_text[] =
+U_BOOT_LONGHELP(esbc_validate,
        "esbc_validate hdr_addr <hash_val> - Validates signature using\n"
        "                          RSA verification\n"
        "                          $hdr_addr Address of header of the image\n"
        "                          to be validated.\n"
        "                          $hash_val -Optional\n"
        "                          It provides Hash of public/srk key to be\n"
-       "                          used to verify signature.\n";
+       "                          used to verify signature.\n");
 
 U_BOOT_CMD(
        esbc_validate,  3,      0,      do_esbc_validate,

diff --git a/board/kontron/sl28/cmds.c b/board/kontron/sl28/cmds.c
index 7851361c48cc7ee68b4e93b62ea89cf9ae3744cc..07514778753f86b33bf8fbf12c3132157d532577 100644 (file)
--- a/board/kontron/sl28/cmds.c
+++ b/board/kontron/sl28/cmds.c
@@ -172,8 +172,8 @@ out:
        return CMD_RET_FAILURE;
 }
 
-static char sl28_help_text[] =
-       "nvm [<hex>] - display/set the 16 non-volatile bits\n";
+U_BOOT_LONGHELP(sl28,
+       "nvm [<hex>] - display/set the 16 non-volatile bits\n");
 
 U_BOOT_CMD_WITH_SUBCMDS(sl28, "SMARC-sAL28 specific", sl28_help_text,
                        U_BOOT_SUBCMD_MKENT(nvm, 2, 1, do_sl28_nvm));

diff --git a/board/xilinx/versal-net/cmds.c b/board/xilinx/versal-net/cmds.c
index 4d52084846b7a592b053e3e364997a0fbfc8929f..e8b669f0fd48754981b1bf8762761c0a9792eff5 100644 (file)
--- a/board/xilinx/versal-net/cmds.c
+++ b/board/xilinx/versal-net/cmds.c
@@ -71,10 +71,9 @@ static int do_versalnet_load_pdi(struct cmd_tbl *cmdtp, int flag, int argc,
        return cmd_process_error(cmdtp, ret);
 }
 
-static char versalnet_help_text[] =
+U_BOOT_LONGHELP(versalnet,
        "loadpdi addr len - Load pdi image\n"
-       "load pdi image at ddr address 'addr' with pdi image size 'len'\n"
-;
+       "load pdi image at ddr address 'addr' with pdi image size 'len'\n");
 
 U_BOOT_CMD_WITH_SUBCMDS(versalnet, "Versal NET sub-system", versalnet_help_text,
                        U_BOOT_SUBCMD_MKENT(loadpdi, 3, 1,

diff --git a/cmd/adc.c b/cmd/adc.c
index f87f9785a114a46dde98d6b860af5ef51fec52f8..4d3b5b61f6f0236c1d74db5b2a86adc38a94340b 100644 (file)
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -152,11 +152,11 @@ static int do_adc_scan(struct cmd_tbl *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static char adc_help_text[] =
+U_BOOT_LONGHELP(adc,
        "list - list ADC devices\n"
        "adc info <name> - Get ADC device info\n"
        "adc single <name> <channel> [varname] - Get Single data of ADC device channel\n"
-       "adc scan <name> [channel mask] - Scan all [or masked] ADC channels";
+       "adc scan <name> [channel mask] - Scan all [or masked] ADC channels\n");
 
 U_BOOT_CMD_WITH_SUBCMDS(adc, "ADC sub-system", adc_help_text,
        U_BOOT_SUBCMD_MKENT(list, 1, 1, do_adc_list),

diff --git a/cmd/arm/exception.c b/cmd/arm/exception.c
index 98a9795b68c82cf0dfb6d416c68a1cb7826814a2..8857f1216049823df4724f4616c8511ed8f9851b 100644 (file)
--- a/cmd/arm/exception.c
+++ b/cmd/arm/exception.c
@@ -49,12 +49,11 @@ static struct cmd_tbl cmd_sub[] = {
                         "", ""),
 };
 
-static char exception_help_text[] =
+U_BOOT_LONGHELP(exception,
        "<ex>\n"
        "  The following exceptions are available:\n"
        "  breakpoint - prefetch abort\n"
        "  unaligned  - data abort\n"
-       "  undefined  - undefined instruction\n"
-       ;
+       "  undefined  - undefined instruction\n");
 
 #include <exception.h>

diff --git a/cmd/arm/exception64.c b/cmd/arm/exception64.c
index 73d6c20ccaceef4f153322b5f43ed87ea237f8c8..4c5b953168cbe0d26719cdf5d4b21d4ed74a80ab 100644 (file)
--- a/cmd/arm/exception64.c
+++ b/cmd/arm/exception64.c
@@ -77,12 +77,11 @@ static struct cmd_tbl cmd_sub[] = {
                         "", ""),
 };
 
-static char exception_help_text[] =
+U_BOOT_LONGHELP(exception,
        "<ex>\n"
        "  The following exceptions are available:\n"
        "  breakpoint - breakpoint instruction exception\n"
        "  unaligned  - unaligned LDAR data abort\n"
-       "  undefined  - undefined instruction exception\n"
-       ;
+       "  undefined  - undefined instruction exception\n");
 
 #include <exception.h>

diff --git a/cmd/blob.c b/cmd/blob.c
index a3c1dc49224d00f5616c7bc0f639ba19bb0b2743..b1c72e3f440658b83c0b3c76548433f5a88cf48c 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -99,7 +99,7 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc,
 }
 
 /***************************************************/
-static char blob_help_text[] =
+U_BOOT_LONGHELP(blob,
        "enc src dst len km - Encapsulate and create blob of data\n"
        "                          $len bytes long at address $src and\n"
        "                          store the result at address $dst.\n"
@@ -115,7 +115,7 @@ static char blob_help_text[] =
        "                          modifier is stored.\n"
        "                          The modifier is required for generation\n"
        "                          /use as key for cryptographic operation.\n"
-       "                          Key modifier should be 16 byte long.\n";
+       "                          Key modifier should be 16 byte long.\n");
 
 U_BOOT_CMD(
        blob, 6, 1, do_blob,

diff --git a/cmd/cli.c b/cmd/cli.c
index be3bf7dfe20218e3415fc64843278ecc698ce52f..e0ddd0a43d0bfc344ad62d6d4a30b6cdf3d35f16 100644 (file)
--- a/cmd/cli.c
+++ b/cmd/cli.c
@@ -118,16 +118,11 @@ static int do_cli(struct cmd_tbl *cmdtp, int flag, int argc,
        return CMD_RET_USAGE;
 }
 
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
-static char cli_help_text[] =
+U_BOOT_LONGHELP(cli,
        "get - print current cli\n"
-       "set - set the current cli, possible value are: old, modern"
-       ;
-#endif
+       "set - set the current cli, possible value are: old, modern\n");
 
 U_BOOT_CMD(cli, 3, 1, do_cli,
           "cli",
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
           cli_help_text
-#endif
 );

diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c
index 14ad6c440a5606120a7bf3308be2cca8eb35b9ce..2b58b1c449c08d02bef2c0cba477d574258f6505 100644 (file)
--- a/cmd/riscv/exception.c
+++ b/cmd/riscv/exception.c
@@ -68,14 +68,13 @@ static struct cmd_tbl cmd_sub[] = {
                         "", ""),
 };
 
-static char exception_help_text[] =
+U_BOOT_LONGHELP(exception,
        "<ex>\n"
        "  The following exceptions are available:\n"
        "  compressed - compressed instruction\n"
        "  ebreak     - breakpoint\n"
        "  ialign16   - 16 bit aligned instruction\n"
        "  undefined  - illegal instruction\n"
-       "  unaligned  - load address misaligned\n"
-       ;
+       "  unaligned  - load address misaligned\n");
 
 #include <exception.h>

diff --git a/cmd/scmi.c b/cmd/scmi.c
index 664062c4eff5b6ef16b7c04902ee77a5ff8890c8..cfbca63e1644e387dd80e1a445301eff39ec68b5 100644 (file)
--- a/cmd/scmi.c
+++ b/cmd/scmi.c
@@ -369,7 +369,7 @@ static int do_scmi(struct cmd_tbl *cmdtp, int flag,
        return cp->cmd(cmdtp, flag, argc, argv);
 }
 
-static char scmi_help_text[] =
+U_BOOT_LONGHELP(scmi,
        " - SCMI utility\n"
        " info - get the info of SCMI services\n"
        " perm_dev <agent-id in hex> <device-id in hex> <flags in hex>\n"
@@ -377,8 +377,7 @@ static char scmi_help_text[] =
        " perm_proto <agent-id in hex> <device-id in hex> <protocol-id in hex> <flags in hex>\n"
        "   - set protocol permission to device\n"
        " reset <agent-id in hex> <flags in hex>\n"
-       "   - reset platform resource settings\n"
-       "";
+       "   - reset platform resource settings\n");
 
 U_BOOT_CMD(scmi, CONFIG_SYS_MAXARGS, 0, do_scmi, "SCMI utility",
           scmi_help_text);

diff --git a/cmd/x86/exception.c b/cmd/x86/exception.c
index 14b6bd6f4932e6536d7c2a82a679989992cd9be9..02735494a3c6e196d40f98f7bdaa6866deb39966 100644 (file)
--- a/cmd/x86/exception.c
+++ b/cmd/x86/exception.c
@@ -19,10 +19,9 @@ static struct cmd_tbl cmd_sub[] = {
                         "", ""),
 };
 
-static char exception_help_text[] =
+U_BOOT_LONGHELP(exception,
        "<ex>\n"
        "  The following exceptions are available:\n"
-       "  undefined  - undefined instruction\n"
-       ;
+       "  undefined  - undefined instruction\n");
 
 #include <exception.h>