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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e9d0b690830107bcb7d32cd02d6754589dc2f3a9..873f0174c83716c358bca90d48c493afcd8431d0 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -871,6 +871,17 @@ config ARCH_RK29
        help
          Support for Rockchip's RK29xx SoCs.
 
+config ARCH_RK2928
+       bool "Rockchip RK2928"
+       select PLAT_RK
+       select CPU_V7
+       select ARM_GIC
+       select PL330
+       select MIGHT_HAVE_CACHE_L2X0
+       select ARM_ERRATA_754322
+       help
+         Support for Rockchip's RK2928 SoCs.
+
 config ARCH_RK30
        bool "Rockchip RK30xx"
        select PLAT_RK
@@ -986,6 +997,7 @@ source "arch/arm/mach-realview/Kconfig"
 
 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-sa1100/Kconfig"