From e159771117e3a9a01fb26678a299ba62764aa7bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 29 Aug 2012 20:30:50 +0800 Subject: [PATCH] rk30: add ARCH_RK30XX config --- arch/arm/mach-rk30/Kconfig | 12 ++++++++++-- arch/arm/mach-rk30/Makefile | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig index 8157d9844aff..f028bbc3c126 100755 --- 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 2805ed46cff6..85ac75b5827d 100644 --- 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) -- 2.34.1