From: Paul Mundt Date: Tue, 11 Sep 2007 09:10:23 +0000 (+0900) Subject: sh: Don't enable FPU for SH4AL-DSP. X-Git-Tag: v2.6.24-rc1~1377^2~55 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1db4e9bb5682fd3fd3f37f7fe9c322e7c5bb7578;p=karo-tx-linux.git 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 --- diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c1214ccea009..f6d6ac308f69 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 5a92b3becdd7..96775ff03703 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