You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/09/16 07:59:34 UTC

[incubator-nuttx-apps] branch master updated: apps/nshlib: correct commands with alphabet order in kconfig

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 732450d42 apps/nshlib: correct commands with alphabet order in kconfig
732450d42 is described below

commit 732450d42a4fcd738d71f0866da704f1c432f50f
Author: Junbo Zheng <zh...@xiaomi.com>
AuthorDate: Tue Sep 13 20:05:50 2022 +0800

    apps/nshlib: correct commands with alphabet order in kconfig
    
    Signed-off-by: Junbo Zheng <zh...@xiaomi.com>
---
 nshlib/Kconfig       | 8 ++++----
 nshlib/nsh_command.c | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 40d86cbdc..263ab5132 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -245,10 +245,6 @@ config NSH_DISABLE_CMP
 	bool "Disable cmp"
 	default DEFAULT_SMALL
 
-config NSH_DISABLE_TIMEDATECTL
-	bool "Disable TIMEDATECTL"
-	default DEFAULT_SMALL || !LIBC_LOCALTIME || !RTC
-
 config NSH_DISABLE_DATE
 	bool "Disable date"
 	default DEFAULT_SMALL || !RTC
@@ -494,6 +490,10 @@ config NSH_DISABLE_TIME
 	bool "Disable time"
 	default DEFAULT_SMALL
 
+config NSH_DISABLE_TIMEDATECTL
+	bool "Disable timedatectl"
+	default DEFAULT_SMALL || !LIBC_LOCALTIME || !RTC
+
 config NSH_DISABLE_TEST
 	bool "Disable test"
 	default DEFAULT_SMALL
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 77423366e..d577e21b1 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -154,11 +154,6 @@ static const struct cmdmap_s g_cmdmap[] =
   { "dirname",  cmd_dirname,  2, 2, "<path>" },
 #endif
 
-#ifndef CONFIG_NSH_DISABLE_TIMEDATECTL
-  { "timedatectl", cmd_timedatectl, 1, 3, "[set-timezone TZ]"
-  },
-#endif
-
 #ifndef CONFIG_NSH_DISABLE_DATE
   { "date",     cmd_date,     1, 4, "[-s \"MMM DD HH:MM:SS YYYY\"] [-u]" },
 #endif
@@ -537,6 +532,10 @@ static const struct cmdmap_s g_cmdmap[] =
   { "time",     cmd_time,     2, 2, "\"<command>\"" },
 #endif
 
+#ifndef CONFIG_NSH_DISABLE_TIMEDATECTL
+  { "timedatectl", cmd_timedatectl, 1, 3, "[set-timezone TZ]" },
+#endif
+
 #ifndef CONFIG_NSH_DISABLESCRIPT
   { "true",     cmd_true,     1, 1, NULL },
 #endif