michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: Merge platform capability related menus

Browse source 
Reduces redundancy in the x86 Kconfig menus.

Change-Id: I90ff7d6aedda2aa02528b6821eeaf7eb6bea321c
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-08-04 10:05:24 -04:00 • committed by Anas Nashif
commit 1c701bc83a
8 changed files with 41 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

50
arch/x86/Kconfig
View file

@ -101,7 +101,14 @@ config CLFLUSH_INSTRUCTION_SUPPORTED
available, instead of the one using WBINVD. available, instead of the one using WBINVD.
menu "Platform Capabilities" menu "Platform Capabilities"
config BOI_HANDLER_SUPPORTED config ADVANCED_IDLE_SUPPORTED
bool "Advanced Idle Supported"
default n
help
This option signifies that the target supports the ADVANCED_IDLE
configuration option.
config BOI_HANDLER_SUPPORTED
bool "BOI Handler Supported" bool "BOI Handler Supported"
default n default n
help help
@ -139,6 +146,20 @@ config LOCK_INSTRUCTION_UNSUPPORTED
atomic manner; such targets must utilize other techniques to perform atomic manner; such targets must utilize other techniques to perform
atomic operations (such as locking interrupts). atomic operations (such as locking interrupts).
config NUM_DYNAMIC_STUBS
int "Number of dynamic int stubs"
default 0
help
This option specifies the number of interrupt handlers that can be
installed dynamically using irq_connect().
config SHUTOFF_PIC
bool "Shutoff PIC"
depends on !PIC
default n
help
This option disables all interrupts on the PIC
endmenu endmenu
menu "Specific CPU Capability Support" menu "Specific CPU Capability Support"
@ -178,33 +199,6 @@ config CACHE_LINE_SIZE
endmenu endmenu
menu "Specific Platform Capability Support"
config NUM_DYNAMIC_STUBS
int "Number of dynamic int stubs"
default 0
help
This option specifies the number of interrupt handlers that can be
installed dynamically using irq_connect().
config ADVANCED_IDLE_SUPPORTED
bool "Advanced idle supported"
default n
help
This option signifies that the target supports the ADVANCED_IDLE
configuration option.
endmenu
config SHUTOFF_PIC
bool "Shutoff PIC"
depends on !PIC
default n
help
This option disables all interrupts on the PIC
menu "Floating Point Options" menu "Floating Point Options"
depends on !CPU_FLOAT_UNSUPPORTED depends on !CPU_FLOAT_UNSUPPORTED

10
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -94,10 +94,13 @@ CONFIG_CPU_ATOM=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_BOI_HANDLER_SUPPORTED is not set # CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -108,13 +111,6 @@ CONFIG_CMOV=y
# CONFIG_CPU_SSE_UNSUPPORTED is not set # CONFIG_CPU_SSE_UNSUPPORTED is not set
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
CONFIG_SHUTOFF_PIC=y
# #
# Floating Point Options # Floating Point Options
# #

8
arch/x86/configs/micro_basic_minuteia_defconfig
View file

@ -94,10 +94,12 @@ CONFIG_CPU_MINUTEIA=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
CONFIG_BOI_HANDLER_SUPPORTED=y CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -108,12 +110,6 @@ CONFIG_CPU_FLOAT_UNSUPPORTED=y
CONFIG_CPU_SSE_UNSUPPORTED=y CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# #
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #

10
arch/x86/configs/micro_galileo_defconfig
View file

@ -94,10 +94,13 @@ CONFIG_CPU_MINUTEIA=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_BOI_HANDLER_SUPPORTED is not set # CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -108,13 +111,6 @@ CONFIG_CPU_FLOAT_UNSUPPORTED=y
CONFIG_CPU_SSE_UNSUPPORTED=y CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_SHUTOFF_PIC is not set
# #
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #

10
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -73,10 +73,13 @@ CONFIG_CPU_ATOM=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_BOI_HANDLER_SUPPORTED is not set # CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
CONFIG_SHUTOFF_PIC=y
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -87,13 +90,6 @@ CONFIG_CMOV=y
# CONFIG_CPU_SSE_UNSUPPORTED is not set # CONFIG_CPU_SSE_UNSUPPORTED is not set
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
CONFIG_SHUTOFF_PIC=y
# #
# Floating Point Options # Floating Point Options
# #

10
arch/x86/configs/nano_basic_minuteia_defconfig
View file

@ -73,10 +73,12 @@ CONFIG_CPU_MINUTEIA=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
CONFIG_BOI_HANDLER_SUPPORTED=y CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -87,14 +89,6 @@ CONFIG_CPU_FLOAT_UNSUPPORTED=y
CONFIG_CPU_SSE_UNSUPPORTED=y CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
#
# Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set

10
arch/x86/configs/nano_galileo_defconfig
View file

@ -73,10 +73,13 @@ CONFIG_CPU_MINUTEIA=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_BOI_HANDLER_SUPPORTED is not set # CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -87,13 +90,6 @@ CONFIG_CPU_FLOAT_UNSUPPORTED=y
CONFIG_CPU_SSE_UNSUPPORTED=y CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_SHUTOFF_PIC is not set
# #
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #

10
arch/x86/defconfig
View file

@ -94,10 +94,13 @@ CONFIG_CPU_MINUTEIA=y
# #
# Platform Capabilities # Platform Capabilities
# #
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_BOI_HANDLER_SUPPORTED is not set # CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_SHUTOFF_PIC is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
@ -108,13 +111,6 @@ CONFIG_CPU_FLOAT_UNSUPPORTED=y
CONFIG_CPU_SSE_UNSUPPORTED=y CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
#
# Specific Platform Capability Support
#
CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
# CONFIG_SHUTOFF_PIC is not set
# #
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #