[PATCH 1/3] ARM: rockchip: add new ARCH_ROCKCHIP_{V7,V8} symbols

[Sascha Hauer]

On Fri, Jan 14, 2022 at 09:38:23AM +0100, Ahmad Fatoum wrote:
> In preparation for adding rk3399 support, which is another SoC with
> ARMv8 CPUs, add new ARCH_ROCKCHIP_{V7,V8} symbols for the common
> functionality.
> 
> Signed-off-by: Ahmad Fatoum <ahmad at a3f.at>
> ---
>  arch/arm/mach-rockchip/Kconfig  | 18 ++++++++++++------
>  arch/arm/mach-rockchip/Makefile |  5 +++--
>  2 files changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 2e855714f7da..596de663f9e3 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -12,24 +12,30 @@ config RK_TIMER
>  	hex
>  	default 1
>  
> -config ARCH_RK3188
> +config ARCH_ROCKCHIP_V7
>  	bool
>  	select CPU_V7
>  	select ARM_SMP_TWD
>  	select ARCH_HAS_L2X0
>  
> +config ARCH_RK3188
> +	bool
> +	select ARCH_ROCKCHIP_V7
> +
>  config ARCH_RK3288
>  	bool
> -	select CPU_V7
> -	select ARM_SMP_TWD
> -	select ARCH_HAS_L2X0
> +	select ARCH_ROCKCHIP_V7
>  	select CLOCKSOURCE_ROCKCHIP
>  
> -config ARCH_RK3568
> +config ARCH_ROCKCHIP_V8
>  	bool
>  	select CPU_V8
> -	select ARM_ATF
>  	select SYS_SUPPORTS_64BIT_KERNEL
> +	select ARM_ATF
> +
> +config ARCH_RK3568
> +	bool
> +	select ARCH_ROCKCHIP_V8
>  
>  comment "select Rockchip boards:"
>  
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index 72bf77c1e124..474b8629d13f 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -1,9 +1,10 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  
>  obj-y += rockchip.o
> -pbl-$(CONFIG_ARCH_RK3568) += atf.o
> +pbl-$(CONFIG_ARCH_ROCKCHIP_V8) += atf.o
>  obj-$(CONFIG_ARCH_RK3188) += rk3188.o
>  obj-$(CONFIG_ARCH_RK3288) += rk3288.o
> +obj-pbl-$(CONFIG_ARCH_RK3399) += rk3399.o

We don't have this yet, removed this hunk while applying.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |