Commit f5ad881b authored by Paul Mundt's avatar Paul Mundt

sh: Use SYS_SUPPORTS_CMT for managing CMT timer dependencies.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 424f59d0
...@@ -107,6 +107,9 @@ config SYS_SUPPORTS_NUMA ...@@ -107,6 +107,9 @@ config SYS_SUPPORTS_NUMA
config SYS_SUPPORTS_PCI config SYS_SUPPORTS_PCI
bool bool
config SYS_SUPPORTS_CMT
bool
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
def_bool y def_bool y
...@@ -188,6 +191,7 @@ choice ...@@ -188,6 +191,7 @@ choice
config CPU_SUBTYPE_SH7619 config CPU_SUBTYPE_SH7619
bool "Support SH7619 processor" bool "Support SH7619 processor"
select CPU_SH2 select CPU_SH2
select SYS_SUPPORTS_CMT
# SH-2A Processor Support # SH-2A Processor Support
...@@ -200,15 +204,18 @@ config CPU_SUBTYPE_SH7203 ...@@ -200,15 +204,18 @@ config CPU_SUBTYPE_SH7203
bool "Support SH7203 processor" bool "Support SH7203 processor"
select CPU_SH2A select CPU_SH2A
select CPU_HAS_FPU select CPU_HAS_FPU
select SYS_SUPPORTS_CMT
config CPU_SUBTYPE_SH7206 config CPU_SUBTYPE_SH7206
bool "Support SH7206 processor" bool "Support SH7206 processor"
select CPU_SH2A select CPU_SH2A
select SYS_SUPPORTS_CMT
config CPU_SUBTYPE_SH7263 config CPU_SUBTYPE_SH7263
bool "Support SH7263 processor" bool "Support SH7263 processor"
select CPU_SH2A select CPU_SH2A
select CPU_HAS_FPU select CPU_HAS_FPU
select SYS_SUPPORTS_CMT
config CPU_SUBTYPE_MXG config CPU_SUBTYPE_MXG
bool "Support MX-G processor" bool "Support MX-G processor"
...@@ -324,6 +331,7 @@ config CPU_SUBTYPE_SH7723 ...@@ -324,6 +331,7 @@ config CPU_SUBTYPE_SH7723
select CPU_SH4A select CPU_SH4A
select CPU_SHX2 select CPU_SHX2
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_CMT
help help
Select SH7723 if you have an SH-MobileR2 CPU. Select SH7723 if you have an SH-MobileR2 CPU.
...@@ -362,6 +370,7 @@ config CPU_SUBTYPE_SHX3 ...@@ -362,6 +370,7 @@ config CPU_SUBTYPE_SHX3
config CPU_SUBTYPE_SH7343 config CPU_SUBTYPE_SH7343
bool "Support SH7343 processor" bool "Support SH7343 processor"
select CPU_SH4AL_DSP select CPU_SH4AL_DSP
select SYS_SUPPORTS_CMT
config CPU_SUBTYPE_SH7722 config CPU_SUBTYPE_SH7722
bool "Support SH7722 processor" bool "Support SH7722 processor"
...@@ -369,6 +378,7 @@ config CPU_SUBTYPE_SH7722 ...@@ -369,6 +378,7 @@ config CPU_SUBTYPE_SH7722
select CPU_SHX2 select CPU_SHX2
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_NUMA
select SYS_SUPPORTS_CMT
config CPU_SUBTYPE_SH7366 config CPU_SUBTYPE_SH7366
bool "Support SH7366 processor" bool "Support SH7366 processor"
...@@ -376,6 +386,7 @@ config CPU_SUBTYPE_SH7366 ...@@ -376,6 +386,7 @@ config CPU_SUBTYPE_SH7366
select CPU_SHX2 select CPU_SHX2
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_NUMA
select SYS_SUPPORTS_CMT
# SH-5 Processor Support # SH-5 Processor Support
...@@ -397,34 +408,36 @@ source "arch/sh/boards/Kconfig" ...@@ -397,34 +408,36 @@ source "arch/sh/boards/Kconfig"
menu "Timer and clock configuration" menu "Timer and clock configuration"
config SH_TIMER_CMT
def_bool n
prompt "CMT support"
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
help
This enables build of the CMT system timer driver.
config SH_TMU config SH_TMU
def_bool y bool "TMU timer support"
prompt "TMU timer support"
depends on CPU_SH3 || CPU_SH4 depends on CPU_SH3 || CPU_SH4
default y
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
help help
This enables the use of the TMU as the system timer. This enables the use of the TMU as the system timer.
config SH_CMT config SH_CMT
def_bool y bool "CMT timer support"
prompt "CMT timer support" depends on SYS_SUPPORTS_CMT
depends on CPU_SH2 && !CPU_SUBTYPE_MXG default y
help help
This enables the use of the CMT as the system timer. This enables the use of the CMT as the system timer.
#
# Support for the new-style CMT driver. This will replace SH_CMT
# once its other dependencies are merged.
#
config SH_TIMER_CMT
bool "CMT clockevents driver"
depends on SYS_SUPPORTS_CMT && !SH_CMT
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
config SH_MTU2 config SH_MTU2
def_bool n bool "MTU2 timer support"
prompt "MTU2 timer support"
depends on CPU_SH2A depends on CPU_SH2A
default y
help help
This enables the use of the MTU2 as the system timer. This enables the use of the MTU2 as the system timer.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment