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>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c1214ccea0097d1ebdd876ec3dd21bb446680516..f6d6ac308f698034a903b0b8cfa709b723b31fed 100644 (file)
--- 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 5a92b3becdd7af1b3a7e4772868ab7aab31eca52..96775ff03703694bf4860cf713decda0da3e06c7 100644 (file)
--- 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