diff --git a/arch/arc/Makefile b/arch/arc/Makefile index c1512d3e104..ec9faad7d98 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,7 +1,6 @@ obj-y = core/ obj-y += bsp/ obj-y += timer/ -obj-y += interrupt_controller/ obj-$(CONFIG_NSIM) += serial/ obj-y += timer/ diff --git a/arch/arc/interrupt_controller/Makefile b/arch/arc/interrupt_controller/Makefile deleted file mode 100644 index 71373986973..00000000000 --- a/arch/arc/interrupt_controller/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) -asflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) - - -obj-y += arcv2_irq_unit.o diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig index 1fa0970ff21..8bc4787014b 100644 --- a/drivers/interrupt_controller/Kconfig +++ b/drivers/interrupt_controller/Kconfig @@ -48,9 +48,19 @@ config LOAPIC config IOAPIC bool "IOAPIC" default n - depends on X86_32 + depends on X86_32 help This option signifies that the target has an IO-APIC device. This capability allows IO-APIC-dependent code to be included. +config ARCV2_INTERRUPT_UNIT + bool "ARCv2 Interrupt Unit" + default y + depends on ARC + help + The ARCv2 interrupt unit has 16 allocated exceptions associated with + vectors 0 to 15 and 240 interrupts associated with vectors 16 to 255. + The interrupt unit is optional in the ARCv2-based processors. When + building a processor, you can configure the processor to include an + interrupt unit. The ARCv2 interrupt unit is highly programmable. endmenu diff --git a/drivers/interrupt_controller/Makefile b/drivers/interrupt_controller/Makefile index 2075447a5bd..6d4ca639269 100644 --- a/drivers/interrupt_controller/Makefile +++ b/drivers/interrupt_controller/Makefile @@ -11,3 +11,4 @@ obj-$(CONFIG_LOAPIC) += system_apic.o obj-$(CONFIG_LOAPIC) += loapic_intr.o obj-$(CONFIG_IOAPIC) += ioapic_intr.o +obj-$(CONFIG_ARCV2_INTERRUPT_UNIT) += arcv2_irq_unit.o diff --git a/arch/arc/interrupt_controller/arcv2_irq_unit.c b/drivers/interrupt_controller/arcv2_irq_unit.c similarity index 100% rename from arch/arc/interrupt_controller/arcv2_irq_unit.c rename to drivers/interrupt_controller/arcv2_irq_unit.c