Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
phyus
/
linux-vybrid_public
8
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

sh: remove CONFIG_CPU_HAS_INTC_IRQ

All processor specific interrupt code is now converted to make use
of the new intc code. The config option CONFIG_CPU_HAS_INTC_IRQ is
because of that pointless.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Magnus Damm há 17 anos atrás
pai
a1fd306b88
commit
1254d1db11
3 ficheiros alterados com 1 adições e 25 exclusões
Visão Unificada Mostrar Estatísticas Diff
  1. 0 3
      arch/sh/Kconfig
  2. 1 2
      arch/sh/kernel/cpu/irq/Makefile
  3. 0 20
      arch/sh/mm/Kconfig

+ 0 - 3
arch/sh/Kconfig
Ver Ficheiro 

@@ -178,9 +178,6 @@ config CPU_HAS_INTEVT
 
 config CPU_HAS_MASKREG_IRQ
 
 config CPU_HAS_MASKREG_IRQ
 
 	bool
 
 	bool
 
 
 
-config CPU_HAS_INTC_IRQ
 
-	bool
 
-
 
 config CPU_HAS_IPR_IRQ
 
 config CPU_HAS_IPR_IRQ
 
 	bool
 
 	bool

+ 1 - 2
arch/sh/kernel/cpu/irq/Makefile
Ver Ficheiro 

@@ -1,8 +1,7 @@
 
 #
 
 #
 
 # Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
 
 # Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
 
 #
 
 #
 
-obj-y	+= imask.o
 
+obj-y	+= imask.o intc.o
 
 
 
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o
 
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)		+= ipr.o
 
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)	+= maskreg.o
 
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)	+= maskreg.o
 
-obj-$(CONFIG_CPU_HAS_INTC_IRQ)		+= intc.o

+ 0 - 20
arch/sh/mm/Kconfig
Ver Ficheiro 

@@ -50,40 +50,34 @@ choice
 
 config CPU_SUBTYPE_SH7619
 
 config CPU_SUBTYPE_SH7619
 
 	bool "Support SH7619 processor"
 
 	bool "Support SH7619 processor"
 
 	select CPU_SH2
 
 	select CPU_SH2
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 # SH-2A Processor Support
 
 # SH-2A Processor Support
 
 
 
 config CPU_SUBTYPE_SH7206
 
 config CPU_SUBTYPE_SH7206
 
 	bool "Support SH7206 processor"
 
 	bool "Support SH7206 processor"
 
 	select CPU_SH2A
 
 	select CPU_SH2A
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 # SH-3 Processor Support
 
 # SH-3 Processor Support
 
 
 
 config CPU_SUBTYPE_SH7705
 
 config CPU_SUBTYPE_SH7705
 
 	bool "Support SH7705 processor"
 
 	bool "Support SH7705 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH7706
 
 config CPU_SUBTYPE_SH7706
 
 	bool "Support SH7706 processor"
 
 	bool "Support SH7706 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
 
 	  Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
 
 
 
 config CPU_SUBTYPE_SH7707
 
 config CPU_SUBTYPE_SH7707
 
 	bool "Support SH7707 processor"
 
 	bool "Support SH7707 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
 	  Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
 
 
 config CPU_SUBTYPE_SH7708
 
 config CPU_SUBTYPE_SH7708
 
 	bool "Support SH7708 processor"
 
 	bool "Support SH7708 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
 
 	  Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
 
 	  if you have a 100 Mhz SH-3 HD6417708R CPU.
 
 	  if you have a 100 Mhz SH-3 HD6417708R CPU.
 
@@ -91,14 +85,12 @@ config CPU_SUBTYPE_SH7708
 
 config CPU_SUBTYPE_SH7709
 
 config CPU_SUBTYPE_SH7709
 
 	bool "Support SH7709 processor"
 
 	bool "Support SH7709 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
 	  Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
 
 
 config CPU_SUBTYPE_SH7710
 
 config CPU_SUBTYPE_SH7710
 
 	bool "Support SH7710 processor"
 
 	bool "Support SH7710 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	select CPU_HAS_DSP
 
 	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.
 
@@ -106,7 +98,6 @@ config CPU_SUBTYPE_SH7710
 
 config CPU_SUBTYPE_SH7712
 
 config CPU_SUBTYPE_SH7712
 
 	bool "Support SH7712 processor"
 
 	bool "Support SH7712 processor"
 
 	select CPU_SH3
 
 	select CPU_SH3
 
-	select CPU_HAS_INTC_IRQ
 
 	select CPU_HAS_DSP
 
 	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.
 
@@ -124,14 +115,12 @@ config CPU_SUBTYPE_SH7720
 
 config CPU_SUBTYPE_SH7750
 
 config CPU_SUBTYPE_SH7750
 
 	bool "Support SH7750 processor"
 
 	bool "Support SH7750 processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
 
 	  Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
 
 
 
 config CPU_SUBTYPE_SH7091
 
 config CPU_SUBTYPE_SH7091
 
 	bool "Support SH7091 processor"
 
 	bool "Support SH7091 processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7091 if you have an SH-4 based Sega device (such as
 
 	  Select SH7091 if you have an SH-4 based Sega device (such as
 
 	  the Dreamcast, Naomi, and Naomi 2).
 
 	  the Dreamcast, Naomi, and Naomi 2).
 
@@ -139,17 +128,14 @@ config CPU_SUBTYPE_SH7091
 
 config CPU_SUBTYPE_SH7750R
 
 config CPU_SUBTYPE_SH7750R
 
 	bool "Support SH7750R processor"
 
 	bool "Support SH7750R processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH7750S
 
 config CPU_SUBTYPE_SH7750S
 
 	bool "Support SH7750S processor"
 
 	bool "Support SH7750S processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH7751
 
 config CPU_SUBTYPE_SH7751
 
 	bool "Support SH7751 processor"
 
 	bool "Support SH7751 processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 	help
 
 	help
 
 	  Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
 
 	  Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
 
 	  or if you have a HD6417751R CPU.
 
 	  or if you have a HD6417751R CPU.
 
@@ -157,12 +143,10 @@ config CPU_SUBTYPE_SH7751
 
 config CPU_SUBTYPE_SH7751R
 
 config CPU_SUBTYPE_SH7751R
 
 	bool "Support SH7751R processor"
 
 	bool "Support SH7751R processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH7760
 
 config CPU_SUBTYPE_SH7760
 
 	bool "Support SH7760 processor"
 
 	bool "Support SH7760 processor"
 
 	select CPU_SH4
 
 	select CPU_SH4
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH4_202
 
 config CPU_SUBTYPE_SH4_202
 
 	bool "Support SH4-202 processor"
 
 	bool "Support SH4-202 processor"
 
@@ -192,19 +176,16 @@ config CPU_SUBTYPE_SH7770
 
 config CPU_SUBTYPE_SH7780
 
 config CPU_SUBTYPE_SH7780
 
 	bool "Support SH7780 processor"
 
 	bool "Support SH7780 processor"
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SH7785
 
 config CPU_SUBTYPE_SH7785
 
 	bool "Support SH7785 processor"
 
 	bool "Support SH7785 processor"
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
 	select CPU_SHX2
 
 	select CPU_SHX2
 
-	select CPU_HAS_INTC_IRQ
 
 
 
 config CPU_SUBTYPE_SHX3
 
 config CPU_SUBTYPE_SHX3
 
 	bool "Support SH-X3 processor"
 
 	bool "Support SH-X3 processor"
 
 	select CPU_SH4A
 
 	select CPU_SH4A
 
 	select CPU_SHX3
 
 	select CPU_SHX3
 
-	select CPU_HAS_INTC_IRQ
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_NUMA
 
 	select SYS_SUPPORTS_NUMA
 
 
 
@@ -218,7 +199,6 @@ config CPU_SUBTYPE_SH7722
 
 	bool "Support SH7722 processor"
 
 	bool "Support SH7722 processor"
 
 	select CPU_SH4AL_DSP
 
 	select CPU_SH4AL_DSP
 
 	select CPU_SHX2
 
 	select CPU_SHX2
 
-	select CPU_HAS_INTC_IRQ
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select ARCH_SPARSEMEM_ENABLE
 
 	select SYS_SUPPORTS_NUMA
 
 	select SYS_SUPPORTS_NUMA