diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-09-11 18:10:23 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-21 11:57:53 +0900 |
commit | 1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578 (patch) | |
tree | 6daaa0ceb4e8d6dd710a3286d25ec43109dfcfd0 /arch | |
parent | d581593388e39d77acd643b1d7427c5ecbb85a03 (diff) | |
download | op-kernel-dev-1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578.zip op-kernel-dev-1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578.tar.gz |
sh: Don't enable FPU for SH4AL-DSP.
This leads to invalid configurations where both FPU and DSP support
can be enabled in the same kernel, resulting in build failure.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/Kconfig | 5 | ||||
-rw-r--r-- | arch/sh/mm/Kconfig | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c1214cc..f6d6ac3 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -118,7 +118,7 @@ endchoice config SH_FPU bool "FPU support" - depends on CPU_SH4 + depends on CPU_HAS_FPU default y help Selecting this option will enable support for SH processors that @@ -199,6 +199,9 @@ config CPU_HAS_PTEA config CPU_HAS_DSP bool +config CPU_HAS_FPU + bool + endmenu menu "Board support" diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 5a92b3b..96775ff 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -18,6 +18,7 @@ config CPU_SH4 select CPU_HAS_INTEVT select CPU_HAS_SR_RB select CPU_HAS_PTEA if (!CPU_SUBTYPE_ST40 && !CPU_SH4A) || CPU_SHX2 + select CPU_HAS_FPU if !CPU_SH4AL_DSP config CPU_SH4A bool |