The config item SYS_ARCH_TIMER is default y if ARM64. Move CONFIG_SYS_ARCH_TIMER to Kconfig for the Rockchip CPU_V7A SoCs that have ARM Generic Timer support.
Signed-off-by: Johan Jonker jbx6244@gmail.com --- arch/arm/mach-rockchip/rk3036/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3128/Kconfig | 3 +++ arch/arm/mach-rockchip/rk322x/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3288/Kconfig | 3 +++ include/configs/rk3036_common.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - 8 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig index 111531be..99754138 100644 --- a/arch/arm/mach-rockchip/rk3036/Kconfig +++ b/arch/arm/mach-rockchip/rk3036/Kconfig @@ -19,6 +19,9 @@ config ROCKCHIP_BOOT_MODE_REG config ROCKCHIP_STIMER_BASE default 0x200440a0
+config SYS_ARCH_TIMER + default y + config SYS_SOC default "rk3036"
diff --git a/arch/arm/mach-rockchip/rk3128/Kconfig b/arch/arm/mach-rockchip/rk3128/Kconfig index 9cc494eb..f6f7de1c 100644 --- a/arch/arm/mach-rockchip/rk3128/Kconfig +++ b/arch/arm/mach-rockchip/rk3128/Kconfig @@ -19,6 +19,9 @@ config ROCKCHIP_BOOT_MODE_REG config ROCKCHIP_STIMER_BASE default 0x200440a0
+config SYS_ARCH_TIMER + default y + config SYS_SOC default "rk3128"
diff --git a/arch/arm/mach-rockchip/rk322x/Kconfig b/arch/arm/mach-rockchip/rk322x/Kconfig index 058f848d..7d74b2cc 100644 --- a/arch/arm/mach-rockchip/rk322x/Kconfig +++ b/arch/arm/mach-rockchip/rk322x/Kconfig @@ -11,6 +11,9 @@ config ROCKCHIP_BOOT_MODE_REG config ROCKCHIP_STIMER_BASE default 0x110d0020
+config SYS_ARCH_TIMER + default y + config SYS_SOC default "rk322x"
diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index dd8c7826..35d471d5 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -151,6 +151,9 @@ config ROCKCHIP_BOOT_MODE_REG config ROCKCHIP_STIMER_BASE default 0xff810020
+config SYS_ARCH_TIMER + default y + config SYS_SOC default "rk3288"
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 10cba727..5905518e 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define COUNTER_FREQUENCY 24000000 -#define CONFIG_SYS_ARCH_TIMER #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 71f66d57..d77a7d7b 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define COUNTER_FREQUENCY 24000000 -#define CONFIG_SYS_ARCH_TIMER #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_IRAM_BASE 0x10080000 diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index aff24018..3258820f 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
#define COUNTER_FREQUENCY 24000000 -#define CONFIG_SYS_ARCH_TIMER #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x61100000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index c781bc7e..e2e0f70a 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define COUNTER_FREQUENCY 24000000 -#define CONFIG_SYS_ARCH_TIMER #define CONFIG_SYS_HZ_CLOCK 24000000
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM