瀏覽代碼

sh: Restrict DSP support to specific CPUs.

Not all CPUs support the DSP, and this leads to problems when mixing
and matching CPU types and DSP opcodes. Fix this up by only allowing
CONFIG_SH_DSP to be enabled for the CPUs that explicitly have such a
block.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 18 年之前
父節點
當前提交
ac79fd58a2
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 5 2
      arch/sh/Kconfig
  2. 3 0
      arch/sh/mm/Kconfig

+ 5 - 2
arch/sh/Kconfig

@@ -134,8 +134,8 @@ config SH_FPU_EMU
 
 
 config SH_DSP
 config SH_DSP
 	bool "DSP support"
 	bool "DSP support"
-	default y if SH4AL_DSP || !CPU_SH4
-	default n
+	depends on CPU_HAS_DSP
+	default y
 	help
 	help
 	  Selecting this option will enable support for SH processors that
 	  Selecting this option will enable support for SH processors that
 	  have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
 	  have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
@@ -199,6 +199,9 @@ config CPU_HAS_SR_RB
 config CPU_HAS_PTEA
 config CPU_HAS_PTEA
 	bool
 	bool
 
 
+config CPU_HAS_DSP
+	bool
+
 endmenu
 endmenu
 
 
 menu "Board support"
 menu "Board support"

+ 3 - 0
arch/sh/mm/Kconfig

@@ -27,6 +27,7 @@ config CPU_SH4A
 config CPU_SH4AL_DSP
 config CPU_SH4AL_DSP
 	bool
 	bool
 	select CPU_SH4A
 	select CPU_SH4A
+	select CPU_HAS_DSP
 
 
 config CPU_SUBTYPE_ST40
 config CPU_SUBTYPE_ST40
 	bool
 	bool
@@ -102,6 +103,7 @@ config CPU_SUBTYPE_SH7710
 	bool "Support SH7710 processor"
 	bool "Support SH7710 processor"
 	select CPU_SH3
 	select CPU_SH3
 	select CPU_HAS_IPR_IRQ
 	select CPU_HAS_IPR_IRQ
+	select CPU_HAS_DSP
 	help
 	help
 	  Select SH7710 if you have a SH3-DSP SH7710 CPU.
 	  Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
 
@@ -109,6 +111,7 @@ config CPU_SUBTYPE_SH7712
 	bool "Support SH7712 processor"
 	bool "Support SH7712 processor"
 	select CPU_SH3
 	select CPU_SH3
 	select CPU_HAS_IPR_IRQ
 	select CPU_HAS_IPR_IRQ
+	select CPU_HAS_DSP
 	help
 	help
 	  Select SH7712 if you have a SH3-DSP SH7712 CPU.
 	  Select SH7712 if you have a SH3-DSP SH7712 CPU.