[components][kconfig] 整理Kconfig目录名称和结构 (#5698)

46 files changed, 32 insertions, 58 deletions

diff --git a/components/Kconfig b/components/Kconfig
index cd222c933b..893858c733 100644
--- a/components/Kconfig
+++ b/components/Kconfig
@@ -23,24 +23,14 @@ config RT_USING_LEGACY
     bool "Support legacy version for compatibility"
     default n
 
-source "$RTT_DIR/components/cplusplus/Kconfig"
-
-source "$RTT_DIR/components/fal/Kconfig"
-
 source "$RTT_DIR/components/finsh/Kconfig"
-
 source "$RTT_DIR/components/dfs/Kconfig"
-
+source "$RTT_DIR/components/fal/Kconfig"
+source "$RTT_DIR/components/lwp/Kconfig"
 source "$RTT_DIR/components/drivers/Kconfig"
-
 source "$RTT_DIR/components/libc/Kconfig"
-
 source "$RTT_DIR/components/net/Kconfig"
-
-source "$RTT_DIR/components/vbus/Kconfig"
-
 source "$RTT_DIR/components/utilities/Kconfig"
-
-source "$RTT_DIR/components/lwp/Kconfig"
+source "$RTT_DIR/components/vbus/Kconfig"
 
 endmenu
diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig
index b93c65512b..28cb892e3e 100644
--- a/components/dfs/Kconfig
+++ b/components/dfs/Kconfig
@@ -1,7 +1,5 @@
-menu "Device virtual file system"
-
-config RT_USING_DFS
-    bool "Using device virtual file system"
+menuconfig RT_USING_DFS
+    bool "DFS: device virtual file system"
     select RT_USING_MUTEX
     default y
     help
@@ -160,5 +158,3 @@ if RT_USING_DFS
     endif
 
 endif
-
-endmenu
diff --git a/components/fal/Kconfig b/components/fal/Kconfig
index 2ee0037184..4eb967b937 100644
--- a/components/fal/Kconfig
+++ b/components/fal/Kconfig
@@ -1,7 +1,7 @@
 
 # Kconfig file for package fal
 menuconfig RT_USING_FAL
-    bool "fal: Flash Abstraction Layer implement. Manage flash device and partition."
+    bool "FAL: flash abstraction layer"
     default n
 
 if RT_USING_FAL
diff --git a/components/finsh/Kconfig b/components/finsh/Kconfig
index cc891e3951..2d9d768e23 100644
--- a/components/finsh/Kconfig
+++ b/components/finsh/Kconfig
@@ -1,16 +1,13 @@
-menu "Command shell"
-
-config RT_USING_FINSH
-    bool
-    default n
-
-config RT_USING_MSH
-    bool "msh shell"
-    select RT_USING_FINSH
+menuconfig RT_USING_MSH
+    bool "MSH: command shell"
     default y
 
 if RT_USING_MSH
 
+    config RT_USING_FINSH
+        bool
+        default y
+
     config FINSH_USING_MSH
         bool
         default y
@@ -80,5 +77,3 @@ if RT_USING_MSH
         default 10
 
 endif
-
-endmenu
diff --git a/components/libc/Kconfig b/components/libc/Kconfig
index 71547e7970..3cdaba4bcf 100644
--- a/components/libc/Kconfig
+++ b/components/libc/Kconfig
@@ -1,4 +1,4 @@
-menu "POSIX layer and C standard library"
+menu "C/C++ and POSIX layer"
 
 config RT_LIBC_DEFAULT_TIMEZONE
     int "Set the default time zone (UTC+)"
@@ -6,5 +6,6 @@ config RT_LIBC_DEFAULT_TIMEZONE
     default 8
 
 source "$RTT_DIR/components/libc/posix/Kconfig"
+source "$RTT_DIR/components/libc/cplusplus/Kconfig"
 
 endmenu
diff --git a/components/cplusplus/Kconfig b/components/libc/cplusplus/Kconfig
index 0877ff9938..c7268e7b9a 100644
--- a/components/cplusplus/Kconfig
+++ b/components/libc/cplusplus/Kconfig
@@ -1,7 +1,5 @@
-menu "C++ features"
-
-config RT_USING_CPLUSPLUS
-    bool "Support C++ features"
+menuconfig RT_USING_CPLUSPLUS
+    bool "Enable C++ features"
     default n
 
 if RT_USING_CPLUSPLUS
@@ -15,5 +13,3 @@ if RT_USING_CPLUSPLUS
         select RT_USING_RTC
 
 endif
-
-endmenu
diff --git a/components/cplusplus/README.md b/components/libc/cplusplus/README.md
index 46c8c78a69..46c8c78a69 100644
--- a/components/cplusplus/README.md
+++ b/components/libc/cplusplus/README.md
diff --git a/components/cplusplus/SConscript b/components/libc/cplusplus/SConscript
index 325a27f65f..325a27f65f 100644
--- a/components/cplusplus/SConscript
+++ b/components/libc/cplusplus/SConscript
diff --git a/components/cplusplus/cpp11/README.md b/components/libc/cplusplus/cpp11/README.md
index a292051608..a292051608 100644
--- a/components/cplusplus/cpp11/README.md
+++ b/components/libc/cplusplus/cpp11/README.md
diff --git a/components/cplusplus/cpp11/README_ZH.md b/components/libc/cplusplus/cpp11/README_ZH.md
index e46bcb90c4..e46bcb90c4 100644
--- a/components/cplusplus/cpp11/README_ZH.md
+++ b/components/libc/cplusplus/cpp11/README_ZH.md
diff --git a/components/cplusplus/cpp11/armclang/clock.cpp b/components/libc/cplusplus/cpp11/armclang/clock.cpp
index 137af393b0..137af393b0 100644
--- a/components/cplusplus/cpp11/armclang/clock.cpp
+++ b/components/libc/cplusplus/cpp11/armclang/clock.cpp
diff --git a/components/cplusplus/cpp11/armclang/condvar.cpp b/components/libc/cplusplus/cpp11/armclang/condvar.cpp
index 7943ccee60..7943ccee60 100644
--- a/components/cplusplus/cpp11/armclang/condvar.cpp
+++ b/components/libc/cplusplus/cpp11/armclang/condvar.cpp
diff --git a/components/cplusplus/cpp11/armclang/miscellaneous.cpp b/components/libc/cplusplus/cpp11/armclang/miscellaneous.cpp
index a084eda8c8..a084eda8c8 100644
--- a/components/cplusplus/cpp11/armclang/miscellaneous.cpp
+++ b/components/libc/cplusplus/cpp11/armclang/miscellaneous.cpp
diff --git a/components/cplusplus/cpp11/armclang/mutex.cpp b/components/libc/cplusplus/cpp11/armclang/mutex.cpp
index 44a70efcf7..44a70efcf7 100644
--- a/components/cplusplus/cpp11/armclang/mutex.cpp
+++ b/components/libc/cplusplus/cpp11/armclang/mutex.cpp
diff --git a/components/cplusplus/cpp11/armclang/thread.cpp b/components/libc/cplusplus/cpp11/armclang/thread.cpp
index e10ffb9cfe..e10ffb9cfe 100644
--- a/components/cplusplus/cpp11/armclang/thread.cpp
+++ b/components/libc/cplusplus/cpp11/armclang/thread.cpp
diff --git a/components/cplusplus/cpp11/armclang/tpl.h b/components/libc/cplusplus/cpp11/armclang/tpl.h
index 70c9503cec..70c9503cec 100644
--- a/components/cplusplus/cpp11/armclang/tpl.h
+++ b/components/libc/cplusplus/cpp11/armclang/tpl.h
diff --git a/components/cplusplus/cpp11/atomic_8.c b/components/libc/cplusplus/cpp11/atomic_8.c
index 64d3311b4a..64d3311b4a 100644
--- a/components/cplusplus/cpp11/atomic_8.c
+++ b/components/libc/cplusplus/cpp11/atomic_8.c
diff --git a/components/cplusplus/cpp11/emutls.c b/components/libc/cplusplus/cpp11/emutls.c
index 576888f16f..576888f16f 100644
--- a/components/cplusplus/cpp11/emutls.c
+++ b/components/libc/cplusplus/cpp11/emutls.c
diff --git a/components/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png b/components/libc/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png
index 0e2381b5d9..0e2381b5d9 100644
--- a/components/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png
+++ b/components/libc/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png
diff --git a/components/cplusplus/cpp11/gcc/__utils.h b/components/libc/cplusplus/cpp11/gcc/__utils.h
index f9a3c93796..f9a3c93796 100644
--- a/components/cplusplus/cpp11/gcc/__utils.h
+++ b/components/libc/cplusplus/cpp11/gcc/__utils.h
diff --git a/components/cplusplus/cpp11/gcc/condition_variable b/components/libc/cplusplus/cpp11/gcc/condition_variable
index f2d48dd5b5..f2d48dd5b5 100644
--- a/components/cplusplus/cpp11/gcc/condition_variable
+++ b/components/libc/cplusplus/cpp11/gcc/condition_variable
diff --git a/components/cplusplus/cpp11/gcc/condition_variable.cpp b/components/libc/cplusplus/cpp11/gcc/condition_variable.cpp
index 2860dd9161..2860dd9161 100644
--- a/components/cplusplus/cpp11/gcc/condition_variable.cpp
+++ b/components/libc/cplusplus/cpp11/gcc/condition_variable.cpp
diff --git a/components/cplusplus/cpp11/gcc/future b/components/libc/cplusplus/cpp11/gcc/future
index 6a686063fb..6a686063fb 100644
--- a/components/cplusplus/cpp11/gcc/future
+++ b/components/libc/cplusplus/cpp11/gcc/future
diff --git a/components/cplusplus/cpp11/gcc/mutex b/components/libc/cplusplus/cpp11/gcc/mutex
index 3fdf86632b..3fdf86632b 100644
--- a/components/cplusplus/cpp11/gcc/mutex
+++ b/components/libc/cplusplus/cpp11/gcc/mutex
diff --git a/components/cplusplus/cpp11/gcc/mutex.cpp b/components/libc/cplusplus/cpp11/gcc/mutex.cpp
index e11f6d8990..e11f6d8990 100644
--- a/components/cplusplus/cpp11/gcc/mutex.cpp
+++ b/components/libc/cplusplus/cpp11/gcc/mutex.cpp
diff --git a/components/cplusplus/cpp11/gcc/thread b/components/libc/cplusplus/cpp11/gcc/thread
index 60e3ec964c..60e3ec964c 100644
--- a/components/cplusplus/cpp11/gcc/thread
+++ b/components/libc/cplusplus/cpp11/gcc/thread
diff --git a/components/cplusplus/cpp11/gcc/thread.cpp b/components/libc/cplusplus/cpp11/gcc/thread.cpp
index 3979da0dc4..3979da0dc4 100644
--- a/components/cplusplus/cpp11/gcc/thread.cpp
+++ b/components/libc/cplusplus/cpp11/gcc/thread.cpp
diff --git a/components/cplusplus/cpp11/gcc/utils.cpp b/components/libc/cplusplus/cpp11/gcc/utils.cpp
index 1ec3b70cad..1ec3b70cad 100644
--- a/components/cplusplus/cpp11/gcc/utils.cpp
+++ b/components/libc/cplusplus/cpp11/gcc/utils.cpp
diff --git a/components/cplusplus/cpp11/thread_local_impl.cpp b/components/libc/cplusplus/cpp11/thread_local_impl.cpp
index 43761c1e62..43761c1e62 100644
--- a/components/cplusplus/cpp11/thread_local_impl.cpp
+++ b/components/libc/cplusplus/cpp11/thread_local_impl.cpp
diff --git a/components/cplusplus/cxx_Mutex.cpp b/components/libc/cplusplus/cxx_Mutex.cpp
index da6f80985f..da6f80985f 100644
--- a/components/cplusplus/cxx_Mutex.cpp
+++ b/components/libc/cplusplus/cxx_Mutex.cpp
diff --git a/components/cplusplus/cxx_Semaphore.cpp b/components/libc/cplusplus/cxx_Semaphore.cpp
index 672eeb04af..672eeb04af 100644
--- a/components/cplusplus/cxx_Semaphore.cpp
+++ b/components/libc/cplusplus/cxx_Semaphore.cpp
diff --git a/components/cplusplus/cxx_Thread.cpp b/components/libc/cplusplus/cxx_Thread.cpp
index f3484bb1f4..f3484bb1f4 100644
--- a/components/cplusplus/cxx_Thread.cpp
+++ b/components/libc/cplusplus/cxx_Thread.cpp
diff --git a/components/cplusplus/cxx_crt.cpp b/components/libc/cplusplus/cxx_crt.cpp
index de2fe3cd74..de2fe3cd74 100644
--- a/components/cplusplus/cxx_crt.cpp
+++ b/components/libc/cplusplus/cxx_crt.cpp
diff --git a/components/cplusplus/cxx_crt.h b/components/libc/cplusplus/cxx_crt.h
index 903d4c86cd..903d4c86cd 100644
--- a/components/cplusplus/cxx_crt.h
+++ b/components/libc/cplusplus/cxx_crt.h
diff --git a/components/cplusplus/cxx_crt_init.c b/components/libc/cplusplus/cxx_crt_init.c
index 46946089ff..46946089ff 100644
--- a/components/cplusplus/cxx_crt_init.c
+++ b/components/libc/cplusplus/cxx_crt_init.c
diff --git a/components/cplusplus/cxx_lock.h b/components/libc/cplusplus/cxx_lock.h
index c3cc1d2dae..c3cc1d2dae 100644
--- a/components/cplusplus/cxx_lock.h
+++ b/components/libc/cplusplus/cxx_lock.h
diff --git a/components/cplusplus/cxx_mail.h b/components/libc/cplusplus/cxx_mail.h
index 88770bdd94..88770bdd94 100644
--- a/components/cplusplus/cxx_mail.h
+++ b/components/libc/cplusplus/cxx_mail.h
diff --git a/components/cplusplus/cxx_mutex.h b/components/libc/cplusplus/cxx_mutex.h
index 63efb4a6ea..63efb4a6ea 100644
--- a/components/cplusplus/cxx_mutex.h
+++ b/components/libc/cplusplus/cxx_mutex.h
diff --git a/components/cplusplus/cxx_queue.h b/components/libc/cplusplus/cxx_queue.h
index f6b91e1a21..f6b91e1a21 100644
--- a/components/cplusplus/cxx_queue.h
+++ b/components/libc/cplusplus/cxx_queue.h
diff --git a/components/cplusplus/cxx_semaphore.h b/components/libc/cplusplus/cxx_semaphore.h
index 45c916e169..45c916e169 100644
--- a/components/cplusplus/cxx_semaphore.h
+++ b/components/libc/cplusplus/cxx_semaphore.h
diff --git a/components/cplusplus/cxx_thread.h b/components/libc/cplusplus/cxx_thread.h
index 0e681e5c2a..0e681e5c2a 100644
--- a/components/cplusplus/cxx_thread.h
+++ b/components/libc/cplusplus/cxx_thread.h
diff --git a/components/libc/posix/Kconfig b/components/libc/posix/Kconfig
index 5c766d9509..411289baf6 100644
--- a/components/libc/posix/Kconfig
+++ b/components/libc/posix/Kconfig
@@ -45,13 +45,13 @@ config RT_USING_POSIX_DELAY
     default n
 
 config RT_USING_POSIX_CLOCK
-    bool "Enable clock/time functions, clock_gettime()/clock_settime()/clock_getres() etc"
+    bool "Enable clock/time APIs, clock_gettime()/clock_settime() etc"
     select RT_USING_POSIX_DELAY
     default n
 
 config RT_USING_POSIX_TIMER
     select RT_USING_TIMER_SOFT
-    bool "Enable posix time functions, timer_create()/timer_gettime()/timer_settime() etc"
+    bool "Enable timer APIs, timer_create()/timer_gettime() etc"
     default n
 
 config RT_USING_PTHREADS
@@ -66,7 +66,7 @@ if RT_USING_PTHREADS
 endif
 
 config RT_USING_MODULE
-    bool "Enable dynamic module with dlopen/dlsym/dlclose feature"
+    bool "Enable dynamic module APIs, dlopen()/dlsym()/dlclose() etc"
     default n
 
 if RT_USING_MODULE
diff --git a/components/lwp/Kconfig b/components/lwp/Kconfig
index fde442d235..5ea3017479 100644
--- a/components/lwp/Kconfig
+++ b/components/lwp/Kconfig
@@ -1,5 +1,5 @@
 config RT_USING_LWP
-    bool "Using light-weight process"
+    bool "LWP: light-weight process"
     select RT_USING_POSIX_FS
     select RT_USING_POSIX_SELECT
     depends on ARCH_ARM_CORTEX_M || ARCH_ARM_ARM9 || ARCH_ARM_CORTEX_A
diff --git a/components/net/lwip/Kconfig b/components/net/lwip/Kconfig
index 42b48f4413..78fba33b91 100644
--- a/components/net/lwip/Kconfig
+++ b/components/net/lwip/Kconfig
@@ -1,5 +1,5 @@
 menuconfig RT_USING_LWIP
-    bool "Enable light weight TCP/IP stack (lwIP)"
+    bool "LwIP: light weight TCP/IP stack"
     select RT_USING_DEVICE
     select RT_USING_DEVICE_IPC
     default n
diff --git a/components/net/sal/Kconfig b/components/net/sal/Kconfig
index 1274258ce6..3836049333 100644
--- a/components/net/sal/Kconfig
+++ b/components/net/sal/Kconfig
@@ -1,5 +1,5 @@
 menuconfig RT_USING_SAL
-    bool "Enable socket abstraction layer (SAL)"
+    bool "SAL: socket abstraction layer"
     select RT_USING_NETDEV
     select RT_USING_SYSTEM_WORKQUEUE
     default n
diff --git a/components/vbus/Kconfig b/components/vbus/Kconfig
index cd30874e38..74a891d2a0 100644
--- a/components/vbus/Kconfig
+++ b/components/vbus/Kconfig
@@ -1,37 +1,35 @@
-menu "VBUS(Virtual Software BUS)"
-
-config RT_USING_VBUS
-    bool "Enable VBUS"
+menuconfig RT_USING_VBUS
+    bool "VBus: virtual software bus"
     default n
 
 if RT_USING_VBUS
     config RT_USING_VBUS_RFS
-        bool "Enable Remote File System on VBUS"
+        bool "Enable Remote File System on VBus"
         default n
         help
             When enable remote file system, the application can visit the remote file system
-            through VBUS with POSIX file I/O.
+            through VBus with POSIX file I/O.
 
     config RT_USING_VBUS_RSHELL
-        bool "Enable Remote Shell on VBUS"
+        bool "Enable Remote Shell on VBus"
         default n
         help
             When enable remote shell, the finsh/msh of RT-Thread can be operated from another
             Operating System.
 
     config RT_VBUS_USING_TESTS
-        bool "Enable tests on VBUS "
+        bool "Enable tests on VBus "
         default n
 
     config _RT_VBUS_RING_BASE
-        hex "VBUS address"
+        hex "VBus address"
         help
-            VBUS ring buffer physical address.
+            VBus ring buffer physical address.
 
     config _RT_VBUS_RING_SZ
-        int "VBUS ring size"
+        int "VBus ring size"
         help
-            VBUS size of the ring buffer.
+            VBus size of the ring buffer.
 
     config RT_VBUS_GUEST_VIRQ
         int "RT_VBUS_GUEST_VIRQ"
@@ -58,5 +56,3 @@ if RT_USING_VBUS
             The name of the UBUS rfs device.
 
 endif
-
-endmenu