Merge remote-tracking branch 'upstream/master'

c1f9ebbd · lymzzyh · f3a96e20 · 2ec22038 · c1f9ebbd · c1f9ebbd
隐藏空白更改
内联并排

Showing with 13 addition and 0 deletion

components/Kconfig components/Kconfig +2 -0

components/utilities/Kconfig components/utilities/Kconfig +11 -0

未找到文件。
--- a/components/Kconfig
+++ b/components/Kconfig
@@ -26,4 +26,6 @@ source "$RTT_DIR/components/gui/Kconfig"

 source "$RTT_DIR/components/vbus/Kconfig"

+source "$RTT_DIR/components/utilities/Kconfig"
+
 endmenu
--- a/components/utilities/Kconfig
+++ b/components/utilities/Kconfig
+menu "Utilities"
+
+config RT_USING_LOGTRACE
+    bool "Enable log trace"
+    default n
+
+config RT_USING_RYM
+    bool "Enable Ymodem"
+    default n
+
+endmenu