[PATCH 149/171] Correct SPL uses of SYS_LONGHELP

Simon Glass sjg at chromium.org
Mon Jan 30 16:15:50 CET 2023


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 at chromium.org>
---

 cmd/bootcount.c | 4 ++--
 cmd/cpu.c       | 2 +-
 cmd/dm.c        | 2 +-
 cmd/ti/pd.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index 654bbb805c1..3898d2543d2 100644
--- 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 a09736e1bb9..314852440f1 100644
--- 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 979cd36061e..3263547cbec 100644
--- 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 008668fd903..a9a182fc386 100644
--- 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"
-- 
2.39.1.456.gfc5497dd1b-goog



More information about the U-Boot mailing list