From 124a27f2109962221464d68cb8e56f63023d87b8 Mon Sep 17 00:00:00 2001 From: Dirk Brandewie Date: Fri, 5 Jun 2015 09:11:24 -0700 Subject: [PATCH] x86/bsp: move local apic driver to drivers/interrupt_controller Change-Id: I69350493c3b94d754f89fb37eaebe50a8076384b Signed-off-by: Dirk Brandewie --- arch/x86/bsp/Makefile | 1 - arch/x86/interrupt_controller/Kconfig | 6 ------ arch/x86/interrupt_controller/Makefile | 1 - drivers/interrupt_controller/Kconfig | 7 +++++++ drivers/interrupt_controller/Makefile | 4 ++++ .../interrupt_controller/loapic_intr.c | 0 .../interrupt_controller/system_apic.c | 0 7 files changed, 11 insertions(+), 8 deletions(-) rename arch/x86/interrupt_controller/loApicIntr.c => drivers/interrupt_controller/loapic_intr.c (100%) rename arch/x86/bsp/systemApic.c => drivers/interrupt_controller/system_apic.c (100%) diff --git a/arch/x86/bsp/Makefile b/arch/x86/bsp/Makefile index 0ae1e202d5c..59079cb911b 100644 --- a/arch/x86/bsp/Makefile +++ b/arch/x86/bsp/Makefile @@ -7,6 +7,5 @@ ifneq ($(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED),y) obj-y += cache_s.o endif -obj-$(CONFIG_LOAPIC) += systemApic.o obj-$(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) += cache.o obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o diff --git a/arch/x86/interrupt_controller/Kconfig b/arch/x86/interrupt_controller/Kconfig index 33191ea3b66..fc7d33fbe38 100644 --- a/arch/x86/interrupt_controller/Kconfig +++ b/arch/x86/interrupt_controller/Kconfig @@ -39,10 +39,4 @@ config IOAPIC This option signifies that the target has an IO-APIC device. This capability allows IO-APIC-dependent code to be included. -config LOAPIC - bool "LOAPIC" - default n - help - This option selects local APIC as the interrupt controller. - endmenu diff --git a/arch/x86/interrupt_controller/Makefile b/arch/x86/interrupt_controller/Makefile index c14fdc9e8c1..fb59e88d23e 100644 --- a/arch/x86/interrupt_controller/Makefile +++ b/arch/x86/interrupt_controller/Makefile @@ -2,5 +2,4 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/x86 ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) -obj-$(CONFIG_LOAPIC) += loApicIntr.o obj-$(CONFIG_IOAPIC) += ioApicIntr.o diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig index 6d15ce57ed2..1ea0f3b596b 100644 --- a/drivers/interrupt_controller/Kconfig +++ b/drivers/interrupt_controller/Kconfig @@ -38,4 +38,11 @@ config PIC default n depends on X86_32 +config LOAPIC + bool "LOAPIC" + default n + depends on X86_32 + help + This option selects local APIC as the interrupt controller. + endmenu diff --git a/drivers/interrupt_controller/Makefile b/drivers/interrupt_controller/Makefile index ffb2644f620..d3e40004c6f 100644 --- a/drivers/interrupt_controller/Makefile +++ b/drivers/interrupt_controller/Makefile @@ -4,5 +4,9 @@ asflags-y +=-I$(srctree)/arch/x86/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR)) obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o + obj-$(CONFIG_PIC) += i8259_boi.o obj-$(CONFIG_PIC) += system_pic.o +obj-$(CONFIG_LOAPIC) += system_apic.o +obj-$(CONFIG_LOAPIC) += loapic_intr.o + diff --git a/arch/x86/interrupt_controller/loApicIntr.c b/drivers/interrupt_controller/loapic_intr.c similarity index 100% rename from arch/x86/interrupt_controller/loApicIntr.c rename to drivers/interrupt_controller/loapic_intr.c diff --git a/arch/x86/bsp/systemApic.c b/drivers/interrupt_controller/system_apic.c similarity index 100% rename from arch/x86/bsp/systemApic.c rename to drivers/interrupt_controller/system_apic.c