rockchip: Clean up CPU selection

In preparation for RK3368 and RK3399, which need to select ARM64, don't
select CPU_V7 at the ARCH_ROCKCHIP level but at the SoC level instead.

Cc: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 397981a40c1b254c2a7743b7a73f3e09fbeafa53..5c1992406eff4fb570eb4639e087c7924f97d631 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -843,7 +843,6 @@ config ARCH_ROCKCHIP
        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
-       select CPU_V7
        select BLK
        select DM
        select SPL_DM

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index cf718fab57315786edc1c9dcc2bab1cd772407c7..86b77f8df706d6d24735b6603e5c395c1b60bf8c 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -2,6 +2,7 @@ if ARCH_ROCKCHIP
 
 config ROCKCHIP_RK3288
        bool "Support Rockchip RK3288"
+       select CPU_V7
        help
          The Rockchip RK3288 is a ARM-based SoC with a quad-core Cortex-A17
          including NEON and GPU, 1MB L2 cache, Mali-T7 graphics, two
@@ -11,6 +12,7 @@ config ROCKCHIP_RK3288
 
 config ROCKCHIP_RK3036
        bool "Support Rockchip RK3036"
+       select CPU_V7
        help
          The Rockchip RK3036 is a ARM-based SoC with a dual-core Cortex-A7
          including NEON and GPU, Mali-400 graphics, several DDR3 options