michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: Re-order x86 Kconfig menus

Browse source 
The top-level menus "x86 Core Options" and "Bus Options (PCI etc.)" are now
sub-menus to the the top-level menu "General Platform Configurations".

Also, the "Board Capabilities" sub-menu has been hoisted out of the
"x86 Core Options" menu and placed as a renamed sub-menu
(Platform Capabilities) to the top-level "General Platform Configurations"
menu.

This helps to create a more logical flow when using "make menuconfig".

Change-Id: I3a837b039eb735ec4073a1721f00753705fba020
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-29 13:59:01 -04:00 • committed by Anas Nashif
commit 87de8c493f
9 changed files with 185 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

49
arch/x86/Kconfig
View file

@ -41,8 +41,6 @@ source "kernel/Kconfig"
source "misc/Kconfig" source "misc/Kconfig"
source "arch/x86/core/Kconfig"
menu "General Platform Configuration" menu "General Platform Configuration"
choice choice
@ -101,6 +99,47 @@ config CLFLUSH_INSTRUCTION_SUPPORTED
an implementation of _SysCacheFlush() that uses CLFLUSH is made an implementation of _SysCacheFlush() that uses CLFLUSH is made
available, instead of the one using WBINVD. available, instead of the one using WBINVD.
menu "Platform Capabilities"
config BOI_HANDLER_SUPPORTED
bool "BOI Handler Supported"
default n
help
This option signifies that the target has one or more devices whose
driver utilizes a "beginning of interrupt" handler that gets called
before the standard interrupt handling code. This capability
can be used by the driver to suppress spurious interrupts generated
by the device (or for other purposes).
config EOI_HANDLER_SUPPORTED
bool "EOI Handler Supported"
default n
help
This option signifies that the target has one or more devices whose
driver utilizes an "end of interrupt" handler that gets called
after the standard interrupt handling code. This capability
can be used by the driver to tell the device that an interrupt
has been handled (or for other purposes).
config UNALIGNED_WRITE_UNSUPPORTED
bool "Unaligned Write Unsupported"
default n
help
This option signifies that the target may not properly decode the
IA-32 processor's byte enable (BE) lines, resulting in the inability
to read/write unaligned quantities.
config LOCK_INSTRUCTION_UNSUPPORTED
bool "Lock Instruction Unsupported"
default n
help
This option signifies that the target lacks support for the IA-32
LOCK prefix instruction. Code running on such targets cannot
use the LOCK prefix to perform read-modify-write operations in an
atomic manner; such targets must utilize other techniques to perform
atomic operations (such as locking interrupts).
endmenu
menu "Specific CPU Capability Support" menu "Specific CPU Capability Support"
config ISA_IA32 config ISA_IA32
@ -181,8 +220,6 @@ config SHUTOFF_PIC
help help
This option disables all interrupts on the PIC This option disables all interrupts on the PIC
endmenu
menu "Floating Point Options" menu "Floating Point Options"
depends on !CPU_FLOAT_UNSUPPORTED depends on !CPU_FLOAT_UNSUPPORTED
@ -293,6 +330,10 @@ config PCI_DEBUG
endmenu endmenu
source "arch/x86/core/Kconfig"
endmenu
if PLATFORM_IA32 if PLATFORM_IA32
source "arch/x86/platforms/ia32/Kconfig" source "arch/x86/platforms/ia32/Kconfig"
endif endif

40
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -81,26 +81,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -110,6 +90,14 @@ CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -136,6 +124,18 @@ CONFIG_SHUTOFF_PIC=y
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32" CONFIG_PLATFORM="ia32"
CONFIG_UART_CONSOLE_INDEX=0 CONFIG_UART_CONSOLE_INDEX=0

40
arch/x86/configs/micro_basic_minuteia_defconfig
View file

@ -81,26 +81,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -110,6 +90,14 @@ CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -131,6 +119,18 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32" CONFIG_PLATFORM="ia32"
CONFIG_UART_CONSOLE_INDEX=0 CONFIG_UART_CONSOLE_INDEX=0

40
arch/x86/configs/micro_galileo_defconfig
View file

@ -81,26 +81,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -110,6 +90,14 @@ CONFIG_PLATFORM_IA32_PCI=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -133,6 +121,18 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32_pci" CONFIG_PLATFORM="ia32_pci"
CONFIG_UART_CONSOLE_INDEX=1 CONFIG_UART_CONSOLE_INDEX=1

40
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -60,26 +60,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -89,6 +69,14 @@ CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -115,6 +103,18 @@ CONFIG_SHUTOFF_PIC=y
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32" CONFIG_PLATFORM="ia32"
CONFIG_UART_CONSOLE_INDEX=0 CONFIG_UART_CONSOLE_INDEX=0

40
arch/x86/configs/nano_basic_minuteia_defconfig
View file

@ -60,26 +60,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -89,6 +69,14 @@ CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
CONFIG_BOI_HANDLER_SUPPORTED=y
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -110,6 +98,18 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32" CONFIG_PLATFORM="ia32"
CONFIG_UART_CONSOLE_INDEX=0 CONFIG_UART_CONSOLE_INDEX=0

40
arch/x86/configs/nano_galileo_defconfig
View file

@ -60,26 +60,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -89,6 +69,14 @@ CONFIG_PLATFORM_IA32_PCI=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -112,6 +100,18 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32_pci" CONFIG_PLATFORM="ia32_pci"
CONFIG_UART_CONSOLE_INDEX=1 CONFIG_UART_CONSOLE_INDEX=1

44
arch/x86/core/Kconfig
View file

@ -67,48 +67,4 @@ config PHYS_LOAD_ADDR
endmenu endmenu
menu "Board Capabilities"
config BOI_HANDLER_SUPPORTED
bool "BOI Handler Supported"
default n
help
This option signifies that the target has one or more devices whose
driver utilizes a "beginning of interrupt" handler that gets called
before the standard interrupt handling code. This capability
can be used by the driver to suppress spurious interrupts generated
by the device (or for other purposes).
config EOI_HANDLER_SUPPORTED
bool "EOI Handler Supported"
default n
help
This option signifies that the target has one or more devices whose
driver utilizes an "end of interrupt" handler that gets called
after the standard interrupt handling code. This capability
can be used by the driver to tell the device that an interrupt
has been handled (or for other purposes).
config UNALIGNED_WRITE_UNSUPPORTED
bool "Unaligned Write Unsupported"
default n
help
This option signifies that the target may not properly decode the
IA-32 processor's byte enable (BE) lines, resulting in the inability
to read/write unaligned quantities.
config LOCK_INSTRUCTION_UNSUPPORTED
bool "Lock Instruction Unsupported"
default n
help
This option signifies that the target lacks support for the IA-32
LOCK prefix instruction. Code running on such targets cannot
use the LOCK prefix to perform read-modify-write operations in an
atomic manner; such targets must utilize other techniques to perform
atomic operations (such as locking interrupts).
endmenu
endmenu endmenu

40
arch/x86/defconfig
View file

@ -81,26 +81,6 @@ CONFIG_PRINTK=y
# CONFIG_BOOTLOADER_KEXEC is not set # CONFIG_BOOTLOADER_KEXEC is not set
CONFIG_BOOTLOADER_UNKNOWN=y CONFIG_BOOTLOADER_UNKNOWN=y
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
#
# Board Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# General Platform Configuration # General Platform Configuration
# #
@ -110,6 +90,14 @@ CONFIG_PLATFORM_IA32_PCI=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
#
# Platform Capabilities
#
# CONFIG_BOI_HANDLER_SUPPORTED is not set
CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Specific CPU Capability Support # Specific CPU Capability Support
# #
@ -133,6 +121,18 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
#
# x86 Core Options
#
# CONFIG_NO_ISRS is not set
#
# Memory Layout Options
#
CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_GDT_SPARE_ENTRIES=0
CONFIG_PHYS_LOAD_ADDR=0x00100000
CONFIG_PLATFORM="ia32_pci" CONFIG_PLATFORM="ia32_pci"
CONFIG_UART_CONSOLE_INDEX=1 CONFIG_UART_CONSOLE_INDEX=1