Browse Source

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

Man, Jianting (Meco) 3 years ago
parent
commit
a514b3bd16
46 changed files with 32 additions and 58 deletions
  1. 3 13
      components/Kconfig
  2. 2 6
      components/dfs/Kconfig
  3. 1 1
      components/fal/Kconfig
  4. 6 11
      components/finsh/Kconfig
  5. 2 1
      components/libc/Kconfig
  6. 2 6
      components/libc/cplusplus/Kconfig
  7. 0 0
      components/libc/cplusplus/README.md
  8. 0 0
      components/libc/cplusplus/SConscript
  9. 0 0
      components/libc/cplusplus/cpp11/README.md
  10. 0 0
      components/libc/cplusplus/cpp11/README_ZH.md
  11. 0 0
      components/libc/cplusplus/cpp11/armclang/clock.cpp
  12. 0 0
      components/libc/cplusplus/cpp11/armclang/condvar.cpp
  13. 0 0
      components/libc/cplusplus/cpp11/armclang/miscellaneous.cpp
  14. 0 0
      components/libc/cplusplus/cpp11/armclang/mutex.cpp
  15. 0 0
      components/libc/cplusplus/cpp11/armclang/thread.cpp
  16. 0 0
      components/libc/cplusplus/cpp11/armclang/tpl.h
  17. 0 0
      components/libc/cplusplus/cpp11/atomic_8.c
  18. 0 0
      components/libc/cplusplus/cpp11/emutls.c
  19. 0 0
      components/libc/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png
  20. 0 0
      components/libc/cplusplus/cpp11/gcc/__utils.h
  21. 0 0
      components/libc/cplusplus/cpp11/gcc/condition_variable
  22. 0 0
      components/libc/cplusplus/cpp11/gcc/condition_variable.cpp
  23. 0 0
      components/libc/cplusplus/cpp11/gcc/future
  24. 0 0
      components/libc/cplusplus/cpp11/gcc/mutex
  25. 0 0
      components/libc/cplusplus/cpp11/gcc/mutex.cpp
  26. 0 0
      components/libc/cplusplus/cpp11/gcc/thread
  27. 0 0
      components/libc/cplusplus/cpp11/gcc/thread.cpp
  28. 0 0
      components/libc/cplusplus/cpp11/gcc/utils.cpp
  29. 0 0
      components/libc/cplusplus/cpp11/thread_local_impl.cpp
  30. 0 0
      components/libc/cplusplus/cxx_Mutex.cpp
  31. 0 0
      components/libc/cplusplus/cxx_Semaphore.cpp
  32. 0 0
      components/libc/cplusplus/cxx_Thread.cpp
  33. 0 0
      components/libc/cplusplus/cxx_crt.cpp
  34. 0 0
      components/libc/cplusplus/cxx_crt.h
  35. 0 0
      components/libc/cplusplus/cxx_crt_init.c
  36. 0 0
      components/libc/cplusplus/cxx_lock.h
  37. 0 0
      components/libc/cplusplus/cxx_mail.h
  38. 0 0
      components/libc/cplusplus/cxx_mutex.h
  39. 0 0
      components/libc/cplusplus/cxx_queue.h
  40. 0 0
      components/libc/cplusplus/cxx_semaphore.h
  41. 0 0
      components/libc/cplusplus/cxx_thread.h
  42. 3 3
      components/libc/posix/Kconfig
  43. 1 1
      components/lwp/Kconfig
  44. 1 1
      components/net/lwip/Kconfig
  45. 1 1
      components/net/sal/Kconfig
  46. 10 14
      components/vbus/Kconfig

+ 3 - 13
components/Kconfig

@@ -23,24 +23,14 @@ config RT_USING_LEGACY
     bool "Support legacy version for compatibility"
     bool "Support legacy version for compatibility"
     default n
     default n
 
 
-source "$RTT_DIR/components/cplusplus/Kconfig"
-
-source "$RTT_DIR/components/fal/Kconfig"
-
 source "$RTT_DIR/components/finsh/Kconfig"
 source "$RTT_DIR/components/finsh/Kconfig"
-
 source "$RTT_DIR/components/dfs/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/drivers/Kconfig"
-
 source "$RTT_DIR/components/libc/Kconfig"
 source "$RTT_DIR/components/libc/Kconfig"
-
 source "$RTT_DIR/components/net/Kconfig"
 source "$RTT_DIR/components/net/Kconfig"
-
-source "$RTT_DIR/components/vbus/Kconfig"
-
 source "$RTT_DIR/components/utilities/Kconfig"
 source "$RTT_DIR/components/utilities/Kconfig"
-
-source "$RTT_DIR/components/lwp/Kconfig"
+source "$RTT_DIR/components/vbus/Kconfig"
 
 
 endmenu
 endmenu

+ 2 - 6
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
     select RT_USING_MUTEX
     default y
     default y
     help
     help
@@ -160,5 +158,3 @@ if RT_USING_DFS
     endif
     endif
 
 
 endif
 endif
-
-endmenu

+ 1 - 1
components/fal/Kconfig

@@ -1,7 +1,7 @@
 
 
 # Kconfig file for package fal
 # Kconfig file for package fal
 menuconfig RT_USING_FAL
 menuconfig RT_USING_FAL
-    bool "fal: Flash Abstraction Layer implement. Manage flash device and partition."
+    bool "FAL: flash abstraction layer"
     default n
     default n
 
 
 if RT_USING_FAL
 if RT_USING_FAL

+ 6 - 11
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
     default y
 
 
 if RT_USING_MSH
 if RT_USING_MSH
 
 
+    config RT_USING_FINSH
+        bool
+        default y
+
     config FINSH_USING_MSH
     config FINSH_USING_MSH
         bool
         bool
         default y
         default y
@@ -80,5 +77,3 @@ if RT_USING_MSH
         default 10
         default 10
 
 
 endif
 endif
-
-endmenu

+ 2 - 1
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
 config RT_LIBC_DEFAULT_TIMEZONE
     int "Set the default time zone (UTC+)"
     int "Set the default time zone (UTC+)"
@@ -6,5 +6,6 @@ config RT_LIBC_DEFAULT_TIMEZONE
     default 8
     default 8
 
 
 source "$RTT_DIR/components/libc/posix/Kconfig"
 source "$RTT_DIR/components/libc/posix/Kconfig"
+source "$RTT_DIR/components/libc/cplusplus/Kconfig"
 
 
 endmenu
 endmenu

+ 2 - 6
components/cplusplus/Kconfig → 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
     default n
 
 
 if RT_USING_CPLUSPLUS
 if RT_USING_CPLUSPLUS
@@ -15,5 +13,3 @@ if RT_USING_CPLUSPLUS
         select RT_USING_RTC
         select RT_USING_RTC
 
 
 endif
 endif
-
-endmenu

+ 0 - 0
components/cplusplus/README.md → components/libc/cplusplus/README.md


+ 0 - 0
components/cplusplus/SConscript → components/libc/cplusplus/SConscript


+ 0 - 0
components/cplusplus/cpp11/README.md → components/libc/cplusplus/cpp11/README.md


+ 0 - 0
components/cplusplus/cpp11/README_ZH.md → components/libc/cplusplus/cpp11/README_ZH.md


+ 0 - 0
components/cplusplus/cpp11/armclang/clock.cpp → components/libc/cplusplus/cpp11/armclang/clock.cpp


+ 0 - 0
components/cplusplus/cpp11/armclang/condvar.cpp → components/libc/cplusplus/cpp11/armclang/condvar.cpp


+ 0 - 0
components/cplusplus/cpp11/armclang/miscellaneous.cpp → components/libc/cplusplus/cpp11/armclang/miscellaneous.cpp


+ 0 - 0
components/cplusplus/cpp11/armclang/mutex.cpp → components/libc/cplusplus/cpp11/armclang/mutex.cpp


+ 0 - 0
components/cplusplus/cpp11/armclang/thread.cpp → components/libc/cplusplus/cpp11/armclang/thread.cpp


+ 0 - 0
components/cplusplus/cpp11/armclang/tpl.h → components/libc/cplusplus/cpp11/armclang/tpl.h


+ 0 - 0
components/cplusplus/cpp11/atomic_8.c → components/libc/cplusplus/cpp11/atomic_8.c


+ 0 - 0
components/cplusplus/cpp11/emutls.c → components/libc/cplusplus/cpp11/emutls.c


+ 0 - 0
components/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png → components/libc/cplusplus/cpp11/figures/Snipaste_2021-09-02_16-00-09.png


+ 0 - 0
components/cplusplus/cpp11/gcc/__utils.h → components/libc/cplusplus/cpp11/gcc/__utils.h


+ 0 - 0
components/cplusplus/cpp11/gcc/condition_variable → components/libc/cplusplus/cpp11/gcc/condition_variable


+ 0 - 0
components/cplusplus/cpp11/gcc/condition_variable.cpp → components/libc/cplusplus/cpp11/gcc/condition_variable.cpp


+ 0 - 0
components/cplusplus/cpp11/gcc/future → components/libc/cplusplus/cpp11/gcc/future


+ 0 - 0
components/cplusplus/cpp11/gcc/mutex → components/libc/cplusplus/cpp11/gcc/mutex


+ 0 - 0
components/cplusplus/cpp11/gcc/mutex.cpp → components/libc/cplusplus/cpp11/gcc/mutex.cpp


+ 0 - 0
components/cplusplus/cpp11/gcc/thread → components/libc/cplusplus/cpp11/gcc/thread


+ 0 - 0
components/cplusplus/cpp11/gcc/thread.cpp → components/libc/cplusplus/cpp11/gcc/thread.cpp


+ 0 - 0
components/cplusplus/cpp11/gcc/utils.cpp → components/libc/cplusplus/cpp11/gcc/utils.cpp


+ 0 - 0
components/cplusplus/cpp11/thread_local_impl.cpp → components/libc/cplusplus/cpp11/thread_local_impl.cpp


+ 0 - 0
components/cplusplus/cxx_Mutex.cpp → components/libc/cplusplus/cxx_Mutex.cpp


+ 0 - 0
components/cplusplus/cxx_Semaphore.cpp → components/libc/cplusplus/cxx_Semaphore.cpp


+ 0 - 0
components/cplusplus/cxx_Thread.cpp → components/libc/cplusplus/cxx_Thread.cpp


+ 0 - 0
components/cplusplus/cxx_crt.cpp → components/libc/cplusplus/cxx_crt.cpp


+ 0 - 0
components/cplusplus/cxx_crt.h → components/libc/cplusplus/cxx_crt.h


+ 0 - 0
components/cplusplus/cxx_crt_init.c → components/libc/cplusplus/cxx_crt_init.c


+ 0 - 0
components/cplusplus/cxx_lock.h → components/libc/cplusplus/cxx_lock.h


+ 0 - 0
components/cplusplus/cxx_mail.h → components/libc/cplusplus/cxx_mail.h


+ 0 - 0
components/cplusplus/cxx_mutex.h → components/libc/cplusplus/cxx_mutex.h


+ 0 - 0
components/cplusplus/cxx_queue.h → components/libc/cplusplus/cxx_queue.h


+ 0 - 0
components/cplusplus/cxx_semaphore.h → components/libc/cplusplus/cxx_semaphore.h


+ 0 - 0
components/cplusplus/cxx_thread.h → components/libc/cplusplus/cxx_thread.h


+ 3 - 3
components/libc/posix/Kconfig

@@ -45,13 +45,13 @@ config RT_USING_POSIX_DELAY
     default n
     default n
 
 
 config RT_USING_POSIX_CLOCK
 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
     select RT_USING_POSIX_DELAY
     default n
     default n
 
 
 config RT_USING_POSIX_TIMER
 config RT_USING_POSIX_TIMER
     select RT_USING_TIMER_SOFT
     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
     default n
 
 
 config RT_USING_PTHREADS
 config RT_USING_PTHREADS
@@ -66,7 +66,7 @@ if RT_USING_PTHREADS
 endif
 endif
 
 
 config RT_USING_MODULE
 config RT_USING_MODULE
-    bool "Enable dynamic module with dlopen/dlsym/dlclose feature"
+    bool "Enable dynamic module APIs, dlopen()/dlsym()/dlclose() etc"
     default n
     default n
 
 
 if RT_USING_MODULE
 if RT_USING_MODULE

+ 1 - 1
components/lwp/Kconfig

@@ -1,5 +1,5 @@
 config RT_USING_LWP
 config RT_USING_LWP
-    bool "Using light-weight process"
+    bool "LWP: light-weight process"
     select RT_USING_POSIX_FS
     select RT_USING_POSIX_FS
     select RT_USING_POSIX_SELECT
     select RT_USING_POSIX_SELECT
     depends on ARCH_ARM_CORTEX_M || ARCH_ARM_ARM9 || ARCH_ARM_CORTEX_A
     depends on ARCH_ARM_CORTEX_M || ARCH_ARM_ARM9 || ARCH_ARM_CORTEX_A

+ 1 - 1
components/net/lwip/Kconfig

@@ -1,5 +1,5 @@
 menuconfig RT_USING_LWIP
 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
     select RT_USING_DEVICE_IPC
     select RT_USING_DEVICE_IPC
     default n
     default n

+ 1 - 1
components/net/sal/Kconfig

@@ -1,5 +1,5 @@
 menuconfig RT_USING_SAL
 menuconfig RT_USING_SAL
-    bool "Enable socket abstraction layer (SAL)"
+    bool "SAL: socket abstraction layer"
     select RT_USING_NETDEV
     select RT_USING_NETDEV
     select RT_USING_SYSTEM_WORKQUEUE
     select RT_USING_SYSTEM_WORKQUEUE
     default n
     default n

+ 10 - 14
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
     default n
 
 
 if RT_USING_VBUS
 if RT_USING_VBUS
     config RT_USING_VBUS_RFS
     config RT_USING_VBUS_RFS
-        bool "Enable Remote File System on VBUS"
+        bool "Enable Remote File System on VBus"
         default n
         default n
         help
         help
             When enable remote file system, the application can visit the remote file system
             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
     config RT_USING_VBUS_RSHELL
-        bool "Enable Remote Shell on VBUS"
+        bool "Enable Remote Shell on VBus"
         default n
         default n
         help
         help
             When enable remote shell, the finsh/msh of RT-Thread can be operated from another
             When enable remote shell, the finsh/msh of RT-Thread can be operated from another
             Operating System.
             Operating System.
 
 
     config RT_VBUS_USING_TESTS
     config RT_VBUS_USING_TESTS
-        bool "Enable tests on VBUS "
+        bool "Enable tests on VBus "
         default n
         default n
 
 
     config _RT_VBUS_RING_BASE
     config _RT_VBUS_RING_BASE
-        hex "VBUS address"
+        hex "VBus address"
         help
         help
-            VBUS ring buffer physical address.
+            VBus ring buffer physical address.
 
 
     config _RT_VBUS_RING_SZ
     config _RT_VBUS_RING_SZ
-        int "VBUS ring size"
+        int "VBus ring size"
         help
         help
-            VBUS size of the ring buffer.
+            VBus size of the ring buffer.
 
 
     config RT_VBUS_GUEST_VIRQ
     config RT_VBUS_GUEST_VIRQ
         int "RT_VBUS_GUEST_VIRQ"
         int "RT_VBUS_GUEST_VIRQ"
@@ -58,5 +56,3 @@ if RT_USING_VBUS
             The name of the UBUS rfs device.
             The name of the UBUS rfs device.
 
 
 endif
 endif
-
-endmenu