michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/x86: Remove pentium4 Kconfig options

Browse source 
Removes CONFIG_CPU_PENTIUM4 and CONFIG_PLATFORM_PENTIUM4 as Zephyr does not
support the Pentium4.

Change-Id: Ieb1970894eda184f4c33d03e3563fb08f861ec6c
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-10 14:17:56 -04:00 • committed by Anas Nashif
commit c141aaae37
10 changed files with 5 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
arch/x86/Kconfig
View file

@ -47,7 +47,7 @@ menu "Platform General Configuration"
choice choice
prompt "Platform Configuration" prompt "Platform Configuration"
default PLATFORM_PCPENTIUM4 default PLATFORM_QUARK
config PLATFORM_ATOM_N28XX config PLATFORM_ATOM_N28XX
bool "Minimum configuration for ATOM N28XX platform" bool "Minimum configuration for ATOM N28XX platform"
@ -73,17 +73,6 @@ config PLATFORM_PCMINUTEIA
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select PLATFORM_GENERIC_PC select PLATFORM_GENERIC_PC
config PLATFORM_PCPENTIUM4
bool "Minimum configuration for PENTIUM 4 platform"
select CPU_PENTIUM4
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_QUARK config PLATFORM_QUARK
bool "Minimum configuration for QUARK platform" bool "Minimum configuration for QUARK platform"
select CPU_MINUTEIA select CPU_MINUTEIA
@ -106,7 +95,7 @@ config PLATFORM_GENERIC_PC
choice choice
prompt "Intel Processor" prompt "Intel Processor"
default CPU_PENTIUM4 default CPU_MINUTEIA
config CPU_ATOM config CPU_ATOM
bool "Atom" bool "Atom"
@ -117,11 +106,6 @@ config CPU_MINUTEIA
bool "Minute IA" bool "Minute IA"
help help
This option signifies the use of a CPU from the Minute IA family. This option signifies the use of a CPU from the Minute IA family.
config CPU_PENTIUM4
bool "Pentium 4"
help
This option signifies the use of a CPU from the Pentium 4 family.
endchoice endchoice
config ADVANCED_IDLE config ADVANCED_IDLE
@ -170,7 +154,7 @@ menu "Specific CPU Capability Support"
config ISA_IA32 config ISA_IA32
bool bool
default y if CPU_ATOM || CPU_MINUTEIA || CPU_PENTIUM4 default y if CPU_ATOM || CPU_MINUTEIA
default n default n
help help
This option signifies the use of a CPU based on the Intel IA-32 This option signifies the use of a CPU based on the Intel IA-32
@ -215,7 +199,7 @@ config CPU_SSE_UNSUPPORTED
config CACHE_LINE_SIZE config CACHE_LINE_SIZE
int "Cache line size" int "Cache line size"
default 64 if CPU_ATOM || CPU_PENTIUM4 default 64 if CPU_ATOM
default 0 default 0
help help
Size in bytes of a CPU cache line. Size in bytes of a CPU cache line.

2
arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
View file

@ -105,12 +105,10 @@ 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_PCPENTIUM4 is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_QUARK 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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/configs/micro_generic_pc_minuteia_defconfig
View file

@ -105,12 +105,10 @@ 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_PCPENTIUM4 is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_QUARK 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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/configs/micro_quark_defconfig
View file

@ -105,12 +105,10 @@ 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_PCPENTIUM4 is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_QUARK=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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
View file

@ -84,12 +84,10 @@ 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_PCPENTIUM4 is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_QUARK 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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/configs/nano_generic_pc_minuteia_defconfig
View file

@ -84,12 +84,10 @@ 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_PCPENTIUM4 is not set
# CONFIG_PLATFORM_QUARK is not set # CONFIG_PLATFORM_QUARK 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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/configs/nano_quark_defconfig
View file

@ -84,12 +84,10 @@ 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_PCPENTIUM4 is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_QUARK=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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

2
arch/x86/defconfig
View file

@ -105,12 +105,10 @@ 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_PCPENTIUM4 is not set
CONFIG_PLATFORM_QUARK=y CONFIG_PLATFORM_QUARK=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
# CONFIG_CPU_PENTIUM4 is not set
# CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
# #

1
arch/x86/generic_pc/Kconfig
View file

@ -45,7 +45,6 @@ config LOAPIC_TIMER_FREQ
depends on PLATFORM_ATOM_N28XX depends on PLATFORM_ATOM_N28XX
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 1193180 if PLATFORM_PCPENTIUM4
default 150000000 if PLATFORM_ATOM_N28XX default 150000000 if PLATFORM_ATOM_N28XX
default 1193180 if PLATFORM_PCMINUTEIA default 1193180 if PLATFORM_PCMINUTEIA

3
scripts/Makefile.x86.preparch
View file

@ -17,10 +17,9 @@ x86_FLAGS += $(LTO_FLAG)
x86_FLAGS += $(PERF_OPT_FLAG) x86_FLAGS += $(PERF_OPT_FLAG)
x86_FLAGS += $(iSSE_FP_MATH) x86_FLAGS += $(iSSE_FP_MATH)
ISA_FLAG_pentium4-$(CONFIG_CPU_PENTIUM4) = -march=pentium4
ISA_FLAG_quark-$(CONFIG_CPU_MINUTEIA) = -march=pentium ISA_FLAG_quark-$(CONFIG_CPU_MINUTEIA) = -march=pentium
ISA_FLAG_atom-$(CONFIG_CPU_ATOM) = -march=atom -mtune=atom ISA_FLAG_atom-$(CONFIG_CPU_ATOM) = -march=atom -mtune=atom
ISA_FLAG_x86 = $(strip $(ISA_FLAG_pentium4-y) $(ISA_FLAG_quark-y) $(ISA_FLAG_atom-y)) ISA_FLAG_x86 = $(strip $(ISA_FLAG_quark-y) $(ISA_FLAG_atom-y))
QEMU_BIOS ?= /usr/share/qemu QEMU_BIOS ?= /usr/share/qemu
QEMU_CPU_TYPE_x86 = qemu32 QEMU_CPU_TYPE_x86 = qemu32