diff mbox

[U-Boot] rockchip: Clean up CPU selection

Message ID 1468465766-6349-1-git-send-email-afaerber@suse.de
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Andreas Färber July 14, 2016, 3:09 a.m. UTC
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>
---
 arch/arm/Kconfig               | 1 -
 arch/arm/mach-rockchip/Kconfig | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Simon Glass July 15, 2016, 3:20 a.m. UTC | #1
On 13 July 2016 at 21:09, Andreas Färber <afaerber@suse.de> wrote:
> 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>
> ---
>  arch/arm/Kconfig               | 1 -
>  arch/arm/mach-rockchip/Kconfig | 2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass July 15, 2016, 3:56 a.m. UTC | #2
On 14 July 2016 at 21:20, Simon Glass <sjg@chromium.org> wrote:
> On 13 July 2016 at 21:09, Andreas Färber <afaerber@suse.de> wrote:
>> 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>
>> ---
>>  arch/arm/Kconfig               | 1 -
>>  arch/arm/mach-rockchip/Kconfig | 2 ++
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip, thanks!
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3237a74..124ee21 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -841,7 +841,6 @@  config ARCH_ROCKCHIP
 	select SUPPORT_SPL
 	select SPL
 	select OF_CONTROL
-	select CPU_V7
 	select DM
 
 config TARGET_THUNDERX_88XX
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 2a8afac..d3f5ffd 100644
--- 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