Эх сурвалжийг харах

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>
Paul Mundt 17 жил өмнө
parent
commit
1db4e9bb56
2 өөрчлөгдсөн 5 нэмэгдсэн , 1 устгасан
  1. 4 1
      arch/sh/Kconfig
  2. 1 0
      arch/sh/mm/Kconfig

+ 4 - 1
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"

+ 1 - 0
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