patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

x86: Change SHUTOFF_PIC to PIC_DISABLE

Browse source 
Make config variable name match the function.  The PIC is never turned
on in the zephyr code so there is nothing to shut off.

Change-Id: I1627e5a35cc37ef7959f36758c1e1aec03e22782
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
This commit is contained in:
Dirk Brandewie 2015-09-09 11:25:04 -07:00 committed by Anas Nashif
parent 728baf1336
commit dbd25aeb3b
11 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/Kconfig
View file

@ -149,8 +149,8 @@ config NUM_DYNAMIC_STUBS
This option specifies the number of interrupt handlers that can be
installed dynamically using irq_connect().
config SHUTOFF_PIC
bool "Shutoff PIC"
config PIC_DISABLE
bool "Disable PIC"
default n
help
This option disables all interrupts on the PIC

2
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -107,7 +107,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
CONFIG_PIC_DISABLE=y
#
# Processor Capabilities

2
arch/x86/configs/micro_basic_minuteia_defconfig
View file

@ -107,7 +107,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
CONFIG_PIC_DISABLE=y
#
# Processor Capabilities

2
arch/x86/configs/micro_galileo_defconfig
View file

@ -107,7 +107,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# CONFIG_PIC_DISABLE is not set
#
# Processor Capabilities

2
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -84,7 +84,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
CONFIG_PIC_DISABLE=y
#
# Processor Capabilities

2
arch/x86/configs/nano_basic_minuteia_defconfig
View file

@ -84,7 +84,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
CONFIG_PIC_DISABLE=y
#
# Processor Capabilities

2
arch/x86/configs/nano_galileo_defconfig
View file

@ -84,7 +84,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# CONFIG_PIC_DISABLE is not set
#
# Processor Capabilities

2
arch/x86/defconfig
View file

@ -105,7 +105,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# CONFIG_PIC_DISABLE is not set
#
# Processor Capabilities

4
arch/x86/platforms/ia32/system.c
View file

@ -43,13 +43,13 @@ for the ia32 platform.
#include <device.h>
#include <init.h>
#if defined(CONFIG_SHUTOFF_PIC)
#if defined(CONFIG_PIC_DISABLE)
#define pic_init() _i8259_init()
#else
#define pic_init() \
do {/* nothing */ \
} while ((0))
#endif /* CONFIG_SHUTOFF_PIC */
#endif /* CONFIG_PIC_DISABLE */
#ifdef CONFIG_LOAPIC
#include <drivers/loapic.h>

2
drivers/interrupt_controller/Makefile
View file

@ -1,4 +1,4 @@
obj-${CONFIG_SHUTOFF_PIC} = i8259.o
obj-${CONFIG_PIC_DISABLE} = i8259.o
obj-$(CONFIG_LOAPIC) += system_apic.o
obj-$(CONFIG_LOAPIC) += loapic_intr.o

4
include/drivers/pic.h
View file

@ -37,7 +37,7 @@
extern "C" {
#endif
#if defined(CONFIG_SHUTOFF_PIC)
#if defined(CONFIG_PIC_DISABLE)
/* programmable interrupt controller info (pair of cascaded 8259A devices) */
@ -56,7 +56,7 @@ extern void _i8259_init(void);
#endif /* _ASMLANGUAGE */
#endif /* CONFIG_SHUTOFF_PIC */
#endif /* CONFIG_PIC_DISABLE */
#ifdef __cplusplus
}