Explorar o código

除了bsp之外的Kconfig使用rsource替代source

latercomer hai 10 meses
pai
achega
d58c29d23e

+ 4 - 4
Kconfig

@@ -1,4 +1,4 @@
-source "$RTT_DIR/src/Kconfig"
-source "$RTT_DIR/libcpu/Kconfig"
-source "$RTT_DIR/components/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/Kconfig"
+rsource "src/Kconfig"
+rsource "libcpu/Kconfig"
+rsource "components/Kconfig"
+rsource "examples/utest/testcases/Kconfig"

+ 12 - 12
components/Kconfig

@@ -26,25 +26,25 @@ config RT_USING_LEGACY
     default n
 
 if RT_USING_CONSOLE
-source "$RTT_DIR/components/finsh/Kconfig"
+rsource "finsh/Kconfig"
 endif
 
 if !RT_USING_NANO
-source "$RTT_DIR/components/dfs/Kconfig"
-source "$RTT_DIR/components/fal/Kconfig"
-source "$RTT_DIR/components/drivers/Kconfig"
-source "$RTT_DIR/components/libc/Kconfig"
-source "$RTT_DIR/components/net/Kconfig"
-source "$RTT_DIR/components/mprotect/Kconfig"
-source "$RTT_DIR/components/utilities/Kconfig"
-source "$RTT_DIR/components/vbus/Kconfig"
+rsource "dfs/Kconfig"
+rsource "fal/Kconfig"
+rsource "drivers/Kconfig"
+rsource "libc/Kconfig"
+rsource "net/Kconfig"
+rsource "mprotect/Kconfig"
+rsource "utilities/Kconfig"
+rsource "vbus/Kconfig"
 endif
 
 if RT_USING_SMART
-source "$RTT_DIR/components/lwp/Kconfig"
-source "$RTT_DIR/components/mm/Kconfig"
+rsource "lwp/Kconfig"
+rsource "mm/Kconfig"
 endif
 
-source "$RTT_DIR/components/legacy/Kconfig"
+rsource "legacy/Kconfig"
 
 endmenu

+ 3 - 3
components/libc/Kconfig

@@ -9,8 +9,8 @@ config RT_USING_EXTERNAL_LIBC
         RT_USING_EXTERNAL_LIBC in software package's Kconfig
         This option is not available for users to select.
 
-source "$RTT_DIR/components/libc/compilers/common/Kconfig"
-source "$RTT_DIR/components/libc/posix/Kconfig"
-source "$RTT_DIR/components/libc/cplusplus/Kconfig"
+rsource "compilers/common/Kconfig"
+rsource "posix/Kconfig"
+rsource "cplusplus/Kconfig"
 
 endmenu

+ 1 - 1
components/libc/posix/Kconfig

@@ -115,6 +115,6 @@ if RT_USING_MODULE
         default n
 endif
 
-source "$RTT_DIR/components/libc/posix/ipc/Kconfig"
+rsource "ipc/Kconfig"
 
 endmenu

+ 1 - 1
components/lwp/Kconfig

@@ -74,6 +74,6 @@ if RT_USING_LWP
             default n
     endif
 
-source "$RTT_DIR/components/lwp/terminal/Kconfig"
+rsource "terminal/Kconfig"
 endif
 

+ 4 - 4
components/net/Kconfig

@@ -1,8 +1,8 @@
 menu "Network"
 
-source "$RTT_DIR/components/net/sal/Kconfig"
-source "$RTT_DIR/components/net/netdev/Kconfig"
-source "$RTT_DIR/components/net/lwip/Kconfig"
-source "$RTT_DIR/components/net/at/Kconfig"
+rsource "sal/Kconfig"
+rsource "netdev/Kconfig"
+rsource "lwip/Kconfig"
+rsource "at/Kconfig"
 
 endmenu

+ 2 - 2
components/utilities/Kconfig

@@ -220,7 +220,7 @@ config RT_USING_RESOURCE_ID
     bool "Enable resource id"
     default n
 
-source "$RTT_DIR/components/utilities/libadt/Kconfig"
-source "$RTT_DIR/components/utilities/rt-link/Kconfig"
+rsource "libadt/Kconfig"
+rsource "rt-link/Kconfig"
 
 endmenu

+ 8 - 8
examples/utest/testcases/Kconfig

@@ -7,14 +7,14 @@ config RT_USING_UTESTCASES
 
 if RT_USING_UTESTCASES
 
-source "$RTT_DIR/examples/utest/testcases/utest/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/kernel/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/cpp11/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/drivers/serial_v2/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/drivers/ipc/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/posix/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/mm/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/tmpfs/Kconfig"
+rsource "utest/Kconfig"
+rsource "kernel/Kconfig"
+rsource "cpp11/Kconfig"
+rsource "drivers/serial_v2/Kconfig"
+rsource "drivers/ipc/Kconfig"
+rsource "posix/Kconfig"
+rsource "mm/Kconfig"
+rsource "tmpfs/Kconfig"
 endif
 
 endmenu

+ 26 - 26
examples/utest/testcases/posix/Kconfig

@@ -6,32 +6,32 @@ menu "RTT Posix Testcase"
         default n
 
     if RTT_POSIX_TESTCASE
-        # source "$RTT_DIR/examples/utest/testcases/posix/aio_h/Kconfig"        # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/arpa/Kconfig"         # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/ctype_h/Kconfig"      # reserve
-        source "$RTT_DIR/examples/utest/testcases/posix/dirent_h/Kconfig"
-        # source "$RTT_DIR/examples/utest/testcases/posix/errno_h/Kconfig"      # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/fcntl_h/Kconfig"      # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/fenv_h/Kconfig"       # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/inttypes_h/Kconfig"   # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/libgen_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/locale_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/mqueue_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/net/Kconfig"          # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/netdb_h/Kconfig"      # reserve
-        source "$RTT_DIR/examples/utest/testcases/posix/pthread_h/Kconfig"
-        # source "$RTT_DIR/examples/utest/testcases/posix/sched_h/Kconfig"      # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/semaphore_h/Kconfig"  # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/setjmp_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/signal_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/stdarg_h/Kconfig"     # reserve
-        source "$RTT_DIR/examples/utest/testcases/posix/stdio_h/Kconfig"
-        source "$RTT_DIR/examples/utest/testcases/posix/stdlib_h/Kconfig"
-        # source "$RTT_DIR/examples/utest/testcases/posix/string_h/Kconfig"     # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/stropts_h/Kconfig"    # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/sys/Kconfig"          # reserve
-        # source "$RTT_DIR/examples/utest/testcases/posix/time_h/Kconfig"       # reserve
-        source "$RTT_DIR/examples/utest/testcases/posix/unistd_h/Kconfig"
+        # rsource "aio_h/Kconfig"        # reserve
+        # rsource "arpa/Kconfig"         # reserve
+        # rsource "ctype_h/Kconfig"      # reserve
+        rsource "dirent_h/Kconfig"
+        # rsource "errno_h/Kconfig"      # reserve
+        # rsource "fcntl_h/Kconfig"      # reserve
+        # rsource "fenv_h/Kconfig"       # reserve
+        # rsource "inttypes_h/Kconfig"   # reserve
+        # rsource "libgen_h/Kconfig"     # reserve
+        # rsource "locale_h/Kconfig"     # reserve
+        # rsource "mqueue_h/Kconfig"     # reserve
+        # rsource "net/Kconfig"          # reserve
+        # rsource "netdb_h/Kconfig"      # reserve
+        rsource "pthread_h/Kconfig"
+        # rsource "sched_h/Kconfig"      # reserve
+        # rsource "semaphore_h/Kconfig"  # reserve
+        # rsource "setjmp_h/Kconfig"     # reserve
+        # rsource "signal_h/Kconfig"     # reserve
+        # rsource "stdarg_h/Kconfig"     # reserve
+        rsource "stdio_h/Kconfig"
+        rsource "stdlib_h/Kconfig"
+        # rsource "string_h/Kconfig"     # reserve
+        # rsource "stropts_h/Kconfig"    # reserve
+        # rsource "sys/Kconfig"          # reserve
+        # rsource "time_h/Kconfig"       # reserve
+        rsource "unistd_h/Kconfig"
     endif
 
 endmenu

+ 1 - 1
examples/utest/testcases/posix/arpa/Kconfig

@@ -1 +1 @@
-source "$RTT_DIR/examples/utest/testcases/posix/arpa/inet_h/Kconfig"
+rsource "inet_h/Kconfig"

+ 1 - 1
examples/utest/testcases/posix/net/Kconfig

@@ -1 +1 @@
-source "$RTT_DIR/examples/utest/testcases/posix/net/if_h/Kconfig"
+rsource "if_h/Kconfig"

+ 3 - 3
examples/utest/testcases/posix/sys/Kconfig

@@ -1,3 +1,3 @@
-source "$RTT_DIR/examples/utest/testcases/posix/sys/mman_h/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/posix/sys/shm_h/Kconfig"
-source "$RTT_DIR/examples/utest/testcases/posix/sys/utsname_h/Kconfig"
+rsource "mman_h/Kconfig"
+rsource "shm_h/Kconfig"
+rsource "utsname_h/Kconfig"