Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-rk / Kconfig

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index 44e2df1..4d74efd
--- a/arch/arm/plat-rk/Kconfig
+++ b/arch/arm/plat-rk/Kconfig
@@ -111,14 +111,31 @@ menu "Support for RK power manage"
 config CLK_SWITCH_TO_32K
        bool "Support clock switch to 32.768k"
 
+config RK30_I2C_INSRAM
+       bool "Support i2c control interface in sram"
+       
+
 endmenu
 endif
 
+
+choice WIFI_CONTROL
+       prompt "wifi control func Type."
+       default WIFI_CONTROL_FUNC
+ 
 config WIFI_CONTROL_FUNC
         bool "Enable WiFi control function abstraction"
         help
           Enables Power/Reset/Carddetect function abstraction
 
+config WIFI_COMBO_MODULE_CONTROL_FUNC
+        bool "Enable WiFi_combo_module control function abstraction"
+        help
+          Enables Power/Reset/Carddetect function abstraction
+
+endchoice
+
+
 config RK29_VPU
        tristate "VPU (Video Processing Unit) service driver in kernel"
        depends on ARCH_RK29 || ARCH_RK30 || ARCH_RK2928
@@ -146,6 +163,13 @@ config RK_DEBUG_UART
        help
          Select a UART for debugging. -1 disable.
 
+config RK_CONSOLE_THREAD
+       bool "Console write by thread"
+       depends on FIQ_DEBUGGER_CONSOLE
+       default y
+       help
+         Normal kernel printk will write out to UART by "kconsole" kthread
+
 config RK_SRAM_DMA
        bool "Sound DMA buffer in internal SRAM"
        depends on ARCH_RK30
@@ -155,5 +179,9 @@ config RK_PL330_DMA
        select PL330
        help
          DMA API Driver for PL330 DMAC
+         
+config RK_PL330_DMA_TEST
+       bool "pl330 DMA memcpy test"
+       depends on RK_PL330_DMA   
 
 endif