From 9a748371ebe3e897ec2be05a3bf883535cda1259 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 2 Aug 2023 22:20:05 -0400 Subject: [PATCH] timer: allow for configuring it out Some configurations have the system timer driver hardwired in. Let's make them compatible with CONFIG_SYS_CLOCK_EXISTS=n. Signed-off-by: Nicolas Pitre --- boards/posix/native_posix/Kconfig | 2 +- soc/arm/nuvoton_numaker/m46x/Kconfig.series | 2 +- soc/arm/nxp_s32/s32ze/Kconfig.series | 2 +- soc/arm64/bcm_vk/viper/Kconfig.soc | 2 +- soc/arm64/nxp_imx/mimx8m/Kconfig.soc | 6 +++--- soc/arm64/nxp_imx/mimx9/Kconfig.soc | 2 +- soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc | 2 +- soc/arm64/renesas_rcar/gen3/Kconfig.series | 2 +- soc/arm64/rockchip/rk3399/Kconfig.soc | 2 +- soc/arm64/ti_k3/am6x/Kconfig.series | 2 +- soc/arm64/xenvm/Kconfig.soc | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boards/posix/native_posix/Kconfig b/boards/posix/native_posix/Kconfig index 3d79a87504f818..42a77bdf6c7b9a 100644 --- a/boards/posix/native_posix/Kconfig +++ b/boards/posix/native_posix/Kconfig @@ -2,7 +2,7 @@ config BOARD_NATIVE_POSIX bool - select NATIVE_POSIX_TIMER + imply NATIVE_POSIX_TIMER select POSIX_ARCH_CONSOLE select NATIVE_APPLICATION diff --git a/soc/arm/nuvoton_numaker/m46x/Kconfig.series b/soc/arm/nuvoton_numaker/m46x/Kconfig.series index 61e877fbe961d0..381312bee1ad98 100644 --- a/soc/arm/nuvoton_numaker/m46x/Kconfig.series +++ b/soc/arm/nuvoton_numaker/m46x/Kconfig.series @@ -9,7 +9,7 @@ config SOC_SERIES_M46X select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU select CPU_HAS_ARM_MPU - select CORTEX_M_SYSTICK + select CORTEX_M_SYSTICK if SYS_CLOCK_EXISTS select SOC_FAMILY_NUMAKER help Enable support for Nuvoton M46X MCU series diff --git a/soc/arm/nxp_s32/s32ze/Kconfig.series b/soc/arm/nxp_s32/s32ze/Kconfig.series index 863a4cbd6d0d19..b761cd43825083 100644 --- a/soc/arm/nxp_s32/s32ze/Kconfig.series +++ b/soc/arm/nxp_s32/s32ze/Kconfig.series @@ -6,7 +6,7 @@ config SOC_SERIES_S32ZE_R52 bool "NXP S32Z/E series" select ARM - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select CPU_CORTEX_R52 select CPU_HAS_DCLS select CPU_HAS_ARM_MPU diff --git a/soc/arm64/bcm_vk/viper/Kconfig.soc b/soc/arm64/bcm_vk/viper/Kconfig.soc index 592a788f729972..96a9f6cf26a6ff 100644 --- a/soc/arm64/bcm_vk/viper/Kconfig.soc +++ b/soc/arm64/bcm_vk/viper/Kconfig.soc @@ -9,6 +9,6 @@ config SOC_BCM58402_A72 bool "Broadcom BCM58402 A72" select ARM64 select CPU_CORTEX_A72 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS endchoice diff --git a/soc/arm64/nxp_imx/mimx8m/Kconfig.soc b/soc/arm64/nxp_imx/mimx8m/Kconfig.soc index 03c8361c8b242f..8c29bb50c96c8a 100644 --- a/soc/arm64/nxp_imx/mimx8m/Kconfig.soc +++ b/soc/arm64/nxp_imx/mimx8m/Kconfig.soc @@ -9,7 +9,7 @@ config SOC_MIMX8MM_A53 bool "NXP i.MX8MM A53" select ARM64 select CPU_CORTEX_A53 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL @@ -18,7 +18,7 @@ config SOC_MIMX8MP_A53 bool "NXP i.MX8MP A53" select ARM64 select CPU_CORTEX_A53 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL @@ -27,7 +27,7 @@ config SOC_MIMX8MN_A53 bool "NXP i.MX8MN A53" select ARM64 select CPU_CORTEX_A53 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL diff --git a/soc/arm64/nxp_imx/mimx9/Kconfig.soc b/soc/arm64/nxp_imx/mimx9/Kconfig.soc index 0a091196cfb759..01ba98968744ea 100644 --- a/soc/arm64/nxp_imx/mimx9/Kconfig.soc +++ b/soc/arm64/nxp_imx/mimx9/Kconfig.soc @@ -9,7 +9,7 @@ config SOC_MIMX93_A55 bool "NXP i.MX93 A55" select ARM64 select CPU_CORTEX_A55 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select HAS_MCUX if CLOCK_CONTROL select HAS_MCUX_CCM if CLOCK_CONTROL select HAS_MCUX_IOMUXC if PINCTRL diff --git a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc index 5b17567970dbf0..be9ea607c82123 100644 --- a/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc +++ b/soc/arm64/nxp_layerscape/ls1046a/Kconfig.soc @@ -12,6 +12,6 @@ config SOC_LS1046A bool "NXP ls1046a" select ARM64 select CPU_CORTEX_A72 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS endchoice diff --git a/soc/arm64/renesas_rcar/gen3/Kconfig.series b/soc/arm64/renesas_rcar/gen3/Kconfig.series index 395b95175286f0..a5c33c2a23c42a 100644 --- a/soc/arm64/renesas_rcar/gen3/Kconfig.series +++ b/soc/arm64/renesas_rcar/gen3/Kconfig.series @@ -6,7 +6,7 @@ config SOC_SERIES_RCAR_GEN3 select ARM64 select CPU_CORTEX_A57 select SOC_FAMILY_RCAR - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL help Enable support for Renesas RCar Gen3 SoC series diff --git a/soc/arm64/rockchip/rk3399/Kconfig.soc b/soc/arm64/rockchip/rk3399/Kconfig.soc index 8a9382b43ca069..74fb8b6d7d8d55 100644 --- a/soc/arm64/rockchip/rk3399/Kconfig.soc +++ b/soc/arm64/rockchip/rk3399/Kconfig.soc @@ -12,6 +12,6 @@ config SOC_RK3399 bool "Rockchip RK3399" select ARM64 select CPU_CORTEX_A53 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS endchoice diff --git a/soc/arm64/ti_k3/am6x/Kconfig.series b/soc/arm64/ti_k3/am6x/Kconfig.series index 8d3bbc56121843..1de6052d9eda6c 100644 --- a/soc/arm64/ti_k3/am6x/Kconfig.series +++ b/soc/arm64/ti_k3/am6x/Kconfig.series @@ -6,6 +6,6 @@ config SOC_SERIES_AM6X_A53 select SOC_FAMILY_TI_K3 select ARM64 select CPU_CORTEX_A53 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS help Enable support for AM6X A53 Series. diff --git a/soc/arm64/xenvm/Kconfig.soc b/soc/arm64/xenvm/Kconfig.soc index a1c19c27a4c9bb..89f90ed5c7cd10 100644 --- a/soc/arm64/xenvm/Kconfig.soc +++ b/soc/arm64/xenvm/Kconfig.soc @@ -4,7 +4,7 @@ config SOC_XENVM bool "Xen virtual machine on aarch64" select ARM64 - select ARM_ARCH_TIMER + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS select CPU_CORTEX_A72 config XEN_INITIAL_DOMAIN