michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Kconfig: Rework PLATFORM_QUARK to become PLATFORM_IA32_PCI

Browse source 
1. The new name aligns with the 'arch/x86/platforms/ia32_pci' platform
   directory.
2. A shorter prompt works better with menuconfig.
3. Removes IOAPIC selection as HPET_TIMER selection makes it implicit.
4. Removes LINK_AUX_COMPILER_LIBS selection as it does not exist.
5. Removes CPU_MINUTEIA selection to permit CPU_ATOM as a valid choice.

Change-Id: I55694d2594a103f4f5ca233c279df0556ff1327f
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-24 10:29:17 -04:00 • committed by Anas Nashif
commit 739489f337
10 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/Kconfig
View file

@ -47,7 +47,7 @@ menu "Platform General Configuration"
choice choice
prompt "Platform Configuration" prompt "Platform Configuration"
default PLATFORM_QUARK default PLATFORM_IA32_PCI
config PLATFORM_ATOM_N28XX config PLATFORM_ATOM_N28XX
bool "Minimum configuration for ATOM N28XX platform" bool "Minimum configuration for ATOM N28XX platform"
@ -72,15 +72,12 @@ config PLATFORM_PCMINUTEIA
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select PLATFORM_GENERIC_PC select PLATFORM_GENERIC_PC
config PLATFORM_QUARK config PLATFORM_IA32_PCI
bool "Minimum configuration for QUARK platform" bool "IA32 with PCI"
select CPU_MINUTEIA
select IOAPIC
select HPET_TIMER select HPET_TIMER
select EOI_HANDLER_SUPPORTED select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select LINK_AUX_COMPILER_LIBS
select NS16550 select NS16550
select PCI select PCI
@ -322,7 +319,7 @@ if PLATFORM_GENERIC_PC
source "arch/x86/platforms/ia32/Kconfig" source "arch/x86/platforms/ia32/Kconfig"
endif endif
if PLATFORM_QUARK if PLATFORM_IA32_PCI
source "arch/x86/platforms/ia32_pci/Kconfig" source "arch/x86/platforms/ia32_pci/Kconfig"
endif endif

2
arch/x86/Makefile
View file

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

2
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -106,7 +106,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
CONFIG_PLATFORM_ATOM_N28XX=y CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_PLATFORM_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
CONFIG_CPU_ATOM=y CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set

2
arch/x86/configs/micro_basic_minuteia_defconfig
View file

@ -106,7 +106,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_PLATFORM_PCMINUTEIA=y CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y

2
arch/x86/configs/micro_galileo_defconfig
View file

@ -106,7 +106,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y

2
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -85,7 +85,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
CONFIG_PLATFORM_ATOM_N28XX=y CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_PLATFORM_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
CONFIG_CPU_ATOM=y CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set

2
arch/x86/configs/nano_basic_minuteia_defconfig
View file

@ -85,7 +85,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_PLATFORM_PCMINUTEIA=y CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_IA32_PCI is not set
CONFIG_PLATFORM_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y

2
arch/x86/configs/nano_galileo_defconfig
View file

@ -85,7 +85,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y

2
arch/x86/defconfig
View file

@ -106,7 +106,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# #
# CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_PLATFORM_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_IA32_PCI=y
# CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y

2
scripts/Makefile.x86.preparch
View file

@ -10,7 +10,7 @@ PERF_OPT_FLAG = $(PERF_OPT_FLAG-$(PERF_OPT))
ALIGN_STACK_FLAG = $(ALIGN_STACK_FLAG-$(PERF_OPT)) ALIGN_STACK_FLAG = $(ALIGN_STACK_FLAG-$(PERF_OPT))
LTO_FLAG = $(LTO_FLAG-$(CONFIG_LTO)) LTO_FLAG = $(LTO_FLAG-$(CONFIG_LTO))
ifneq ($(CONFIG_PLATFORM_QUARK),y) ifneq ($(CONFIG_PLATFORM_IA32_PCI),y)
iSSE_FP_MATH_ ?= -mno-sse iSSE_FP_MATH_ ?= -mno-sse
iSSE_FP_MATH ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}} iSSE_FP_MATH ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}}
endif endif