rk: Kconfig add RK2928B support

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6a248a2e4d9bd9d3d744fd4473633d67f2f0c60..6c4808b0be4d35cd60342a8b82aef004c9bb9c41 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -884,7 +884,7 @@ config ARCH_RK2928
          Support for Rockchip's RK2928 SoCs.
 
 config ARCH_RK30
-       bool "Rockchip RK30xx/RK3108/RK3168"
+       bool "Rockchip RK2928B/RK30xx/RK3108/RK3168"
        select PLAT_RK
        select CPU_V7
        select ARM_GIC
@@ -895,7 +895,7 @@ config ARCH_RK30
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
        help
-         Support for Rockchip's RK30xx/RK3108/RK3168 SoCs.
+         Support for Rockchip's RK2928B/RK30xx/RK3108/RK3168 SoCs.
 
 config ARCH_RK3188
        bool "Rockchip RK3188"
@@ -1016,6 +1016,7 @@ source "arch/arm/plat-rk/Kconfig"
 source "arch/arm/mach-rk29/Kconfig"
 source "arch/arm/mach-rk2928/Kconfig"
 source "arch/arm/mach-rk30/Kconfig"
+source "arch/arm/mach-rk2928b/Kconfig"
 source "arch/arm/mach-rk3188/Kconfig"
 
 source "arch/arm/mach-sa1100/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a159d5d84244cadaf41b636bb5b6b96cbb6e69f2..15b7be3551c7cd42b559853f8347d4129c932bf0 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PXA)          := pxa
 machine-$(CONFIG_ARCH_REALVIEW)                := realview
 machine-$(CONFIG_ARCH_RK29)            := rk29
 machine-$(CONFIG_ARCH_RK2928)          := rk2928
-machine-$(CONFIG_ARCH_RK30)            := rk30
+machine-$(CONFIG_ARCH_RK30)            := rk30 rk2928b
 machine-$(CONFIG_ARCH_RK3188)          := rk3188
 machine-$(CONFIG_ARCH_RPC)             := rpc
 machine-$(CONFIG_ARCH_S3C2410)         := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443

diff --git a/arch/arm/mach-rk2928b/Kconfig b/arch/arm/mach-rk2928b/Kconfig
new file mode 100644 (file)
index 0000000..e4ab2d0
--- /dev/null
+++ b/arch/arm/mach-rk2928b/Kconfig
@@ -0,0 +1,8 @@
+choice
+       prompt "RK2928B Board Type"
+       depends on SOC_RK2928B
+
+config MACH_RK2928B_TB
+       bool "RK2928B Top Board"
+
+endchoice

diff --git a/arch/arm/mach-rk2928b/Makefile b/arch/arm/mach-rk2928b/Makefile
new file mode 100644 (file)
index 0000000..0ca1f28
--- /dev/null
+++ b/arch/arm/mach-rk2928b/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SOC_RK2928B) += board.o
+board-$(CONFIG_MACH_RK2928B_TB) += board-rk2928b-tb.o

diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig
index 2e9a09bd1765815f7b605ce9d0cff2b03f3439b2..5041f8f0e10d39063343ba7143e97ae746315a4a 100755 (executable)
--- a/arch/arm/mach-rk30/Kconfig
+++ b/arch/arm/mach-rk30/Kconfig
@@ -11,6 +11,10 @@ choice
        depends on ARCH_RK30
        default SOC_RK3066
 
+config SOC_RK2928B
+       bool "RK2928B"
+       select ARCH_RK3066B
+
 config SOC_RK3000
        bool "RK3000"
        select ARCH_RK30XX