rk30: add ARCH_RK30XX config

diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig
index 8157d9844affff6ac87ac19b4cbd47606c3a2cae..f028bbc3c1266ff9781a9c8ea19b1dc11b086dae 100755 (executable)
--- a/arch/arm/mach-rk30/Kconfig
+++ b/arch/arm/mach-rk30/Kconfig
@@ -1,10 +1,16 @@
+if ARCH_RK30
+
 config ARCH_RK3066B
        bool "Rockchip RK3066B"
-       depends on ARCH_RK30
        help
          Support for Rockchip's RK3066B SoCs.
 
-if ARCH_RK30 && !ARCH_RK3066B
+config ARCH_RK30XX
+       bool
+       default y
+       depends on !ARCH_RK3066B
+
+if ARCH_RK30XX
 
 choice
        prompt "RK30xx Board Type"
@@ -50,3 +56,5 @@ config MACH_RK3066B_SDK
 endchoice
 
 endif
+
+endif

diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile
index 2805ed46cff62b7e5c50fbc2f4b298aa84d9df07..85ac75b5827d9dca618d0b274db9efba4b9f87a3 100644 (file)
--- a/arch/arm/mach-rk30/Makefile
+++ b/arch/arm/mach-rk30/Makefile
@@ -1,7 +1,8 @@
 EXTRA_CFLAGS += -Os
 ifneq ($(CONFIG_RK_FPGA),y)
 obj-y += clock.o
-obj-y += clock_data.o
+obj-$(CONFIG_ARCH_RK30XX) += clock_data.o
+obj-$(CONFIG_ARCH_RK3066B) += clock_data-rk3066b.o
 endif
 obj-y += common.o
 CFLAGS_common.o += -DTEXT_OFFSET=$(TEXT_OFFSET)