Kconfig: Create PLATFORM_IA32

Combines the following Kconfig options to create PLATFORM_IA32:
    PLATFORM_GENERIC_PC
    PLATFORM_PCMINUTEIA
    PLATFORM_ATOM_N28XX

The new name aligns with the 'arch/x86/platforms/ia32' platform directory.

Change-Id: I4474cb43040f888d5164382184c27bbb38527440
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-24 10:36:18 -04:00 committed by Anas Nashif
commit ae6ea21005
9 changed files with 24 additions and 60 deletions

View file

@ -43,35 +43,12 @@ source "misc/Kconfig"
source "arch/x86/core/Kconfig" source "arch/x86/core/Kconfig"
menu "Platform General Configuration" menu "General Platform Configuration"
choice choice
prompt "Platform Configuration" prompt "Platform Selection"
default PLATFORM_IA32_PCI default PLATFORM_IA32_PCI
config PLATFORM_ATOM_N28XX
bool "Minimum configuration for ATOM N28XX platform"
select CPU_ATOM
select IOAPIC
select LOAPIC
select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT
select SERIAL_INTERRUPT_LEVEL
select CUSTOM_RANDOM_GENERATOR
select PLATFORM_GENERIC_PC
config PLATFORM_PCMINUTEIA
bool "Minimum configuration for MINUTE IA platform"
select CPU_MINUTEIA
select PIC
select PIT
select BOI_HANDLER_SUPPORTED
select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT
select PLATFORM_GENERIC_PC
config PLATFORM_IA32_PCI config PLATFORM_IA32_PCI
bool "IA32 with PCI" bool "IA32 with PCI"
select HPET_TIMER select HPET_TIMER
@ -81,13 +58,14 @@ config PLATFORM_IA32_PCI
select NS16550 select NS16550
select PCI select PCI
endchoice config PLATFORM_IA32
bool "IA32"
config PLATFORM_GENERIC_PC select EOI_HANDLER_SUPPORTED
bool select BOOTLOADER_UNKNOWN
default n select EXTRA_SERIAL_PORT
select NS16550 select NS16550
endchoice
choice choice
prompt "Intel Processor" prompt "Intel Processor"
@ -315,7 +293,7 @@ config PCI_DEBUG
endmenu endmenu
if PLATFORM_GENERIC_PC if PLATFORM_IA32
source "arch/x86/platforms/ia32/Kconfig" source "arch/x86/platforms/ia32/Kconfig"
endif endif

View file

@ -1,3 +1,3 @@
obj-y += core/ obj-y += core/
obj-$(CONFIG_PLATFORM_IA32_PCI) += platforms/ia32_pci/ obj-$(CONFIG_PLATFORM_IA32_PCI) += platforms/ia32_pci/
obj-$(CONFIG_PLATFORM_GENERIC_PC) += platforms/ia32/ obj-$(CONFIG_PLATFORM_IA32) += platforms/ia32/

View file

@ -102,12 +102,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_PLATFORM_IA32_PCI is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_IA32=y
CONFIG_CPU_ATOM=y 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

View file

@ -102,12 +102,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_PLATFORM_IA32_PCI is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_IA32=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set

View file

@ -102,12 +102,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_IA32_PCI=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_IA32 is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set

View file

@ -81,12 +81,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_PLATFORM_IA32_PCI is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_IA32=y
CONFIG_CPU_ATOM=y 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

View file

@ -81,12 +81,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_PLATFORM_IA32_PCI is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_IA32=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set

View file

@ -81,12 +81,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_IA32_PCI=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_IA32 is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set

View file

@ -102,12 +102,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# Platform General Configuration # General Platform Configuration
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_IA32_PCI=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_IA32 is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set