From 4aac2a5280b426e4825e98d1061422c593826678 Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Thu, 11 Jun 2015 17:05:13 -0400 Subject: [PATCH] Introduce CPU_ATOM for x86 Atom based BSPs now select an atom processor. Change-Id: Iebe90a60d9e7f2025ce6b23fe918b86cd11fdea7 Signed-off-by: Peter Mitsis --- arch/x86/Kconfig | 11 ++++++++--- .../x86/configs/micro_generic_pc_atom_n28xx_defconfig | 3 ++- arch/x86/configs/micro_generic_pc_defconfig | 1 + arch/x86/configs/micro_generic_pc_minuteia_defconfig | 1 + arch/x86/configs/micro_generic_pc_pentium4_defconfig | 1 + arch/x86/configs/micro_quark_defconfig | 1 + arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig | 3 ++- arch/x86/configs/nano_generic_pc_defconfig | 1 + arch/x86/configs/nano_generic_pc_minuteia_defconfig | 1 + arch/x86/configs/nano_generic_pc_pentium4_defconfig | 1 + arch/x86/configs/nano_quark_defconfig | 1 + arch/x86/defconfig | 1 + 12 files changed, 21 insertions(+), 5 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 16cdd9f1652..f2eb0506ed7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -51,7 +51,7 @@ default BSP_PCPENTIUM4 config BSP_ATOM_N28XX bool "Minimum configuration for ATOM N28XX BSP" - select CPU_PENTIUM4 + select CPU_ATOM select IOAPIC select LOAPIC select LOAPIC_TIMER @@ -108,6 +108,11 @@ choice prompt "Intel Processor" default CPU_PENTIUM4 +config CPU_ATOM + bool "Atom" + help + This option signifies the use of a CPU from the Atom family. + config CPU_MINUTEIA bool "Minute IA" help @@ -165,7 +170,7 @@ menu "Specific CPU Capability Support" config ISA_IA32 bool - default y if CPU_MINUTEIA || CPU_PENTIUM4 + default y if CPU_ATOM || CPU_MINUTEIA || CPU_PENTIUM4 default n help This option signifies the use of a CPU based on the Intel IA-32 @@ -210,7 +215,7 @@ config CPU_SSE_UNSUPPORTED config CACHE_LINE_SIZE int "Cache line size" - default 64 if CPU_PENTIUM4 + default 64 if CPU_ATOM || CPU_PENTIUM4 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 1c0c5023460..2cc6f7560bd 100644 --- a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig @@ -103,8 +103,9 @@ CONFIG_BSP_ATOM_N28XX=y # CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +CONFIG_CPU_ATOM=y # CONFIG_CPU_MINUTEIA is not set -CONFIG_CPU_PENTIUM4=y +# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig index 55b46b420e8..53446cf1d86 100644 --- a/arch/x86/configs/micro_generic_pc_defconfig +++ b/arch/x86/configs/micro_generic_pc_defconfig @@ -103,6 +103,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_BSP_PCPENTIUM4=y # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +# CONFIG_CPU_ATOM is not set # CONFIG_CPU_MINUTEIA is not set CONFIG_CPU_PENTIUM4=y # 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 898158b6bf3..dd158345e0a 100644 --- a/arch/x86/configs/micro_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/micro_generic_pc_minuteia_defconfig @@ -103,6 +103,7 @@ CONFIG_BSP_PCMINUTEIA=y # CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_BSP_QUARK is not set CONFIG_BSP_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_generic_pc_pentium4_defconfig b/arch/x86/configs/micro_generic_pc_pentium4_defconfig index 55b46b420e8..53446cf1d86 100644 --- a/arch/x86/configs/micro_generic_pc_pentium4_defconfig +++ b/arch/x86/configs/micro_generic_pc_pentium4_defconfig @@ -103,6 +103,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_BSP_PCPENTIUM4=y # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +# CONFIG_CPU_ATOM is not set # CONFIG_CPU_MINUTEIA is not set CONFIG_CPU_PENTIUM4=y # 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 9faa9796d47..20c2fcd9685 100644 --- a/arch/x86/configs/micro_quark_defconfig +++ b/arch/x86/configs/micro_quark_defconfig @@ -103,6 +103,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_BSP_PCPENTIUM4 is not set CONFIG_BSP_QUARK=y # CONFIG_BSP_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 d876206afd3..8b998a13799 100644 --- a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig @@ -82,8 +82,9 @@ CONFIG_BSP_ATOM_N28XX=y # CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +CONFIG_CPU_ATOM=y # CONFIG_CPU_MINUTEIA is not set -CONFIG_CPU_PENTIUM4=y +# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set # diff --git a/arch/x86/configs/nano_generic_pc_defconfig b/arch/x86/configs/nano_generic_pc_defconfig index d0f8e49ddd5..ba02d574e5f 100644 --- a/arch/x86/configs/nano_generic_pc_defconfig +++ b/arch/x86/configs/nano_generic_pc_defconfig @@ -82,6 +82,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_BSP_PCPENTIUM4=y # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +# CONFIG_CPU_ATOM is not set # CONFIG_CPU_MINUTEIA is not set CONFIG_CPU_PENTIUM4=y # 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 a6a50820fb4..2e1ca4f9d06 100644 --- a/arch/x86/configs/nano_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/nano_generic_pc_minuteia_defconfig @@ -82,6 +82,7 @@ CONFIG_BSP_PCMINUTEIA=y # CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_BSP_QUARK is not set CONFIG_BSP_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_generic_pc_pentium4_defconfig b/arch/x86/configs/nano_generic_pc_pentium4_defconfig index d0f8e49ddd5..ba02d574e5f 100644 --- a/arch/x86/configs/nano_generic_pc_pentium4_defconfig +++ b/arch/x86/configs/nano_generic_pc_pentium4_defconfig @@ -82,6 +82,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_BSP_PCPENTIUM4=y # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +# CONFIG_CPU_ATOM is not set # CONFIG_CPU_MINUTEIA is not set CONFIG_CPU_PENTIUM4=y # 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 51f00244517..e4277f3581a 100644 --- a/arch/x86/configs/nano_quark_defconfig +++ b/arch/x86/configs/nano_quark_defconfig @@ -82,6 +82,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y # CONFIG_BSP_PCPENTIUM4 is not set CONFIG_BSP_QUARK=y # CONFIG_BSP_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 55b46b420e8..53446cf1d86 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -103,6 +103,7 @@ CONFIG_EOI_HANDLER_SUPPORTED=y CONFIG_BSP_PCPENTIUM4=y # CONFIG_BSP_QUARK is not set CONFIG_BSP_GENERIC_PC=y +# CONFIG_CPU_ATOM is not set # CONFIG_CPU_MINUTEIA is not set CONFIG_CPU_PENTIUM4=y # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set