Correct SPL uses of SYS_LONGHELP

This converts 5 usages of this option to the non-SPL form, since there is
no SPL_SYS_LONGHELP defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index 654bbb805c1cd35ab00668336865287fc3d1d2ed..3898d2543d2cd232fbbd54e4e7ee256647a98765 100644 (file)
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc,
        return CMD_RET_USAGE;
 }
 
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+#if IS_ENABLED(CONFIG_SYS_LONGHELP)
 static char bootcount_help_text[] =
        "print - print current bootcounter\n"
        "reset - reset the bootcounter"
@@ -55,7 +55,7 @@ static char bootcount_help_text[] =
 
 U_BOOT_CMD(bootcount, 2, 1, do_bootcount,
           "bootcount",
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+#if IS_ENABLED(CONFIG_SYS_LONGHELP)
           bootcount_help_text
 #endif
 );

diff --git a/cmd/cpu.c b/cmd/cpu.c
index a09736e1bb91852e8c452c04b3721b45edaecaf8..314852440f1d4405641fa47ddedb00b4198de629 100644 (file)
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+#if IS_ENABLED(CONFIG_SYS_LONGHELP)
 static char cpu_help_text[] =
        "list   - list available CPUs\n"
        "cpu detail     - show CPU detail"

diff --git a/cmd/dm.c b/cmd/dm.c
index 979cd36061ed445a66bb81a3a178f37800489e4f..3263547cbec6bf81bed2cdfcc4d7c34c8f8c616c 100644 (file)
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc,
 #define DM_MEM
 #endif
 
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+#if IS_ENABLED(CONFIG_SYS_LONGHELP)
 static char dm_help_text[] =
        "compat        Dump list of drivers with compatibility strings\n"
        "dm devres        Dump list of device resources for each device\n"

diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c
index 008668fd90302281899bd633ff36774652a1fb5d..a9a182fc386e8fbedf66dce53f195588ee927402 100644 (file)
--- a/cmd/ti/pd.c
+++ b/cmd/ti/pd.c
@@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv
 
 U_BOOT_CMD(pd, 4, 1, ti_do_pd,
           "TI power domain control",
-#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+#if IS_ENABLED(CONFIG_SYS_LONGHELP)
           "dump                 - show power domain status\n"
           "enable [psc] [lpsc]  - enable power domain\n"
           "disable [psc] [lpsc] - disable power domain\n"