ARM: rockchip: move common config to Kconfig.common

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 5ecf911bdfd823a9eaa2bae06d6068868a06298e..30f5dc3b0e52e2bfa0a14f28688bf5b492ba459f 100755 (executable)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -22,64 +22,4 @@ config ARCH_ROCKCHIP
        select FIQ_GLUE
        select ARM_ERRATA_818325
 
-if ARCH_ROCKCHIP
-
-config RK_LAST_LOG
-       bool "Save the last kernel log on /proc/last_log"
-       depends on DEBUG_KERNEL && PRINTK
-       default y
-       help
-         It is only intended for debugging.
-
-config RK_DEBUG_UART
-       int "Debug UART"
-       default 2
-       help
-         Select a UART for debugging. -1 disable.
-
-config RK_USB_UART
-        bool "Support USB UART Bypass Function"
-        depends on (RK_DEBUG_UART = 2) 
-
-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 BLOCK_RKNAND
-       tristate "RK NAND Device Support"
-       default n
-       help
-         RK NAND Device Support.
-
-config RK_FPGA
-       bool "FPGA Board"
-
-config DVFS
-        bool "Enable dvfs"
-       default y
-       select PM_OPP
-       select CPU_FREQ
-
-config RK_PM_TESTS
-       bool "/sys/pm_tests/ support"
-       default n
-       select DVFS
-       select WATCHDOG
-
-config DDR_TEST
-       bool "DDR Test"
-       select CRC32
-       default n
-
-config RK_VCODEC
-       tristate "VCODEC (VPU HEVC) service driver in kernel"
-       depends on ARCH_ROCKCHIP
-       default y
-
-config RK_PL330_DMA_TEST
-       bool "pl330 DMA memcpy test"
-
-endif
+source "arch/arm/mach-rockchip/Kconfig.common"

diff --git a/arch/arm/mach-rockchip/Kconfig.common b/arch/arm/mach-rockchip/Kconfig.common
new file mode 100644 (file)
index 0000000..f0a5f3a
--- /dev/null
+++ b/arch/arm/mach-rockchip/Kconfig.common
@@ -0,0 +1,61 @@
+if ARCH_ROCKCHIP
+
+config RK_LAST_LOG
+       bool "Save the last kernel log on /proc/last_log"
+       depends on DEBUG_KERNEL && PRINTK
+       default y
+       help
+         It is only intended for debugging.
+
+config RK_DEBUG_UART
+       int "Debug UART"
+       default 2
+       help
+         Select a UART for debugging. -1 disable.
+
+config RK_USB_UART
+        bool "Support USB UART Bypass Function"
+        depends on (RK_DEBUG_UART = 2) 
+
+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 BLOCK_RKNAND
+       tristate "RK NAND Device Support"
+       default n
+       help
+         RK NAND Device Support.
+
+config RK_FPGA
+       bool "FPGA Board"
+
+config DVFS
+        bool "Enable dvfs"
+       default y
+       select PM_OPP
+       select CPU_FREQ
+
+config RK_PM_TESTS
+       bool "/sys/pm_tests/ support"
+       default n
+       select DVFS
+       select WATCHDOG
+
+config DDR_TEST
+       bool "DDR Test"
+       select CRC32
+       default n
+
+config RK_VCODEC
+       tristate "VCODEC (VPU HEVC) service driver in kernel"
+       depends on ARCH_ROCKCHIP
+       default y
+
+config RK_PL330_DMA_TEST
+       bool "pl330 DMA memcpy test"
+
+endif