diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7a1640d260e..ee4eeae427a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -47,7 +47,7 @@ menu "Platform General Configuration" choice prompt "Platform Configuration" -default PLATFORM_PCPENTIUM4 +default PLATFORM_QUARK config PLATFORM_ATOM_N28XX bool "Minimum configuration for ATOM N28XX platform" @@ -73,17 +73,6 @@ config PLATFORM_PCMINUTEIA select EXTRA_SERIAL_PORT 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 bool "Minimum configuration for QUARK platform" select CPU_MINUTEIA @@ -106,7 +95,7 @@ config PLATFORM_GENERIC_PC choice prompt "Intel Processor" -default CPU_PENTIUM4 +default CPU_MINUTEIA config CPU_ATOM bool "Atom" @@ -117,11 +106,6 @@ config CPU_MINUTEIA bool "Minute IA" help 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 config ADVANCED_IDLE @@ -170,7 +154,7 @@ menu "Specific CPU Capability Support" config ISA_IA32 bool - default y if CPU_ATOM || CPU_MINUTEIA || CPU_PENTIUM4 + default y if CPU_ATOM || CPU_MINUTEIA default n help 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 int "Cache line size" - default 64 if CPU_ATOM || CPU_PENTIUM4 + default 64 if CPU_ATOM default 0 help Size in bytes of a CPU cache line. diff --git a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig index fca1565fc1a..085f5712873 100644 --- a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig @@ -105,12 +105,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_PLATFORM_ATOM_N28XX=y # CONFIG_PLATFORM_PCMINUTEIA is not set -# CONFIG_PLATFORM_PCPENTIUM4 is not set # CONFIG_PLATFORM_QUARK is not set CONFIG_PLATFORM_GENERIC_PC=y CONFIG_CPU_ATOM=y # CONFIG_CPU_MINUTEIA is not set -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/micro_generic_pc_minuteia_defconfig b/arch/x86/configs/micro_generic_pc_minuteia_defconfig index b246a3daf79..481159db0a7 100644 --- a/arch/x86/configs/micro_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/micro_generic_pc_minuteia_defconfig @@ -105,12 +105,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # # CONFIG_PLATFORM_ATOM_N28XX is not set CONFIG_PLATFORM_PCMINUTEIA=y -# CONFIG_PLATFORM_PCPENTIUM4 is not set # CONFIG_PLATFORM_QUARK is not set CONFIG_PLATFORM_GENERIC_PC=y # CONFIG_CPU_ATOM is not set CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig index fed202f15a7..7e67381d7d0 100644 --- a/arch/x86/configs/micro_quark_defconfig +++ b/arch/x86/configs/micro_quark_defconfig @@ -105,12 +105,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # # CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_PCMINUTEIA is not set -# CONFIG_PLATFORM_PCPENTIUM4 is not set CONFIG_PLATFORM_QUARK=y # CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_CPU_ATOM is not set CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig index f042827e651..6079597198a 100644 --- a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig @@ -84,12 +84,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_PLATFORM_ATOM_N28XX=y # CONFIG_PLATFORM_PCMINUTEIA is not set -# CONFIG_PLATFORM_PCPENTIUM4 is not set # CONFIG_PLATFORM_QUARK is not set CONFIG_PLATFORM_GENERIC_PC=y CONFIG_CPU_ATOM=y # CONFIG_CPU_MINUTEIA is not set -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/nano_generic_pc_minuteia_defconfig b/arch/x86/configs/nano_generic_pc_minuteia_defconfig index ef266a699ad..640a1919e02 100644 --- a/arch/x86/configs/nano_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/nano_generic_pc_minuteia_defconfig @@ -84,12 +84,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # # CONFIG_PLATFORM_ATOM_N28XX is not set CONFIG_PLATFORM_PCMINUTEIA=y -# CONFIG_PLATFORM_PCPENTIUM4 is not set # CONFIG_PLATFORM_QUARK is not set CONFIG_PLATFORM_GENERIC_PC=y # CONFIG_CPU_ATOM is not set CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig index d479d7aeb31..06250937b1a 100644 --- a/arch/x86/configs/nano_quark_defconfig +++ b/arch/x86/configs/nano_quark_defconfig @@ -84,12 +84,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # # CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_PCMINUTEIA is not set -# CONFIG_PLATFORM_PCPENTIUM4 is not set CONFIG_PLATFORM_QUARK=y # CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_CPU_ATOM is not set CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/defconfig b/arch/x86/defconfig index fed202f15a7..7e67381d7d0 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -105,12 +105,10 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # # CONFIG_PLATFORM_ATOM_N28XX is not set # CONFIG_PLATFORM_PCMINUTEIA is not set -# CONFIG_PLATFORM_PCPENTIUM4 is not set CONFIG_PLATFORM_QUARK=y # CONFIG_PLATFORM_GENERIC_PC is not set # CONFIG_CPU_ATOM is not set CONFIG_CPU_MINUTEIA=y -# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/generic_pc/Kconfig b/arch/x86/generic_pc/Kconfig index dedeee9d42b..6fe87c040e2 100644 --- a/arch/x86/generic_pc/Kconfig +++ b/arch/x86/generic_pc/Kconfig @@ -45,7 +45,6 @@ config LOAPIC_TIMER_FREQ depends on PLATFORM_ATOM_N28XX config SYS_CLOCK_HW_CYCLES_PER_SEC - default 1193180 if PLATFORM_PCPENTIUM4 default 150000000 if PLATFORM_ATOM_N28XX default 1193180 if PLATFORM_PCMINUTEIA diff --git a/scripts/Makefile.x86.preparch b/scripts/Makefile.x86.preparch index 10883feecdb..0bb3b7bda97 100644 --- a/scripts/Makefile.x86.preparch +++ b/scripts/Makefile.x86.preparch @@ -17,10 +17,9 @@ x86_FLAGS += $(LTO_FLAG) x86_FLAGS += $(PERF_OPT_FLAG) x86_FLAGS += $(iSSE_FP_MATH) -ISA_FLAG_pentium4-$(CONFIG_CPU_PENTIUM4) = -march=pentium4 ISA_FLAG_quark-$(CONFIG_CPU_MINUTEIA) = -march=pentium 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_CPU_TYPE_x86 = qemu32