Merge branch 'master' into addAnnotation

1 files changed, 37 insertions, 5 deletions

diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig
index 159a6cbda3..d197bd246e 100755
--- a/components/drivers/Kconfig
+++ b/components/drivers/Kconfig
@@ -5,10 +5,6 @@ config RT_USING_DEVICE_IPC
     default y
 
 if RT_USING_DEVICE_IPC
-    config RT_PIPE_BUFSZ
-        int "Set pipe buffer size"
-        default 512
-    
     config RT_USING_SYSTEM_WORKQUEUE
         bool "Using system default workqueue"
         default n
@@ -18,7 +14,7 @@ if RT_USING_DEVICE_IPC
             int "The stack size for system workqueue thread"
             default 2048
 
-    config RT_SYSTEM_WORKQUEUE_PRIORITY
+        config RT_SYSTEM_WORKQUEUE_PRIORITY
             int "The priority level of system workqueue thread"
             default 23
     endif
@@ -149,6 +145,42 @@ config RT_USING_PM
     bool "Using Power Management device drivers"
     default n
 
+    if RT_USING_PM
+        config PM_TICKLESS_THRESHOLD_TIME
+            int "PM tickless threashold time"
+            default 2
+
+        config PM_USING_CUSTOM_CONFIG
+            bool "PM using custom pm config"
+            default n
+
+        config PM_ENABLE_DEBUG
+            bool "PM Enable Debug"
+            default n
+
+        config PM_ENABLE_SUSPEND_SLEEP_MODE
+            bool "PM Device suspend change sleep mode"
+            default n
+
+        config PM_ENABLE_THRESHOLD_SLEEP_MODE
+            bool "PM using threshold time change sleep mode"
+            default n
+
+        if PM_ENABLE_THRESHOLD_SLEEP_MODE
+            config PM_LIGHT_THRESHOLD_TIME
+                int "PM light mode threashold time"
+                default 5
+
+            config PM_DEEP_THRESHOLD_TIME
+                int "PM deep mode threashold time"
+                default 20
+
+            config PM_STANDBY_THRESHOLD_TIME
+                int "PM standby mode threashold time"
+                default 100
+        endif
+    endif
+
 config RT_USING_RTC
     bool "Using RTC device drivers"
     default n