[linux-yocto] [PATCH 1/6] x86: Consolidate common x86* CPU features

[Darren Hart]

Move the basic arch, MSR, CPUID, and MICROCODE CONFIG options out of the
common-pc*-cpu.cfg fragments and into the cfg/x86*cfg fragments where
they can be more easily reused.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../bsp/common-pc-64/common-pc-64-cpu.cfg          |    5 -----
 .../kernel-cache/bsp/common-pc/common-pc-cpu.cfg   |    5 -----
 meta/cfg/kernel-cache/cfg/x86.cfg                  |    8 +++++++-
 meta/cfg/kernel-cache/cfg/x86_64.cfg               |    7 +++++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
index e44b958..3cf6df2 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
@@ -11,14 +11,9 @@
 #
 #.........................................................................
 
-CONFIG_X86=y
-CONFIG_64BIT=y
 CONFIG_SMP=y
 CONFIG_MCORE2=y
 CONFIG_IA32_EMULATION=y
-CONFIG_MICROCODE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=24
 CONFIG_PM=y
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-cpu.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-cpu.cfg
index 077de28..ad55eb6 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-cpu.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-cpu.cfg
@@ -11,15 +11,10 @@
 #
 #.........................................................................
 CONFIG_X86_32=y
-# CONFIG_64BIT is not set
-CONFIG_X86=y
 CONFIG_MPENTIUMM=y
 CONFIG_X86_GENERIC=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
-CONFIG_MICROCODE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
 CONFIG_MTRR=y
 CONFIG_SMP=y
 CONFIG_PM=y
diff --git a/meta/cfg/kernel-cache/cfg/x86.cfg b/meta/cfg/kernel-cache/cfg/x86.cfg
index 473d399..06906b0 100644
--- a/meta/cfg/kernel-cache/cfg/x86.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86.cfg
@@ -1,10 +1,16 @@
 # Config settings specific to x86 and not in an existing cfg/foo.cfg
+CONFIG_X86=y
+# CONFIG_64BIT is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE_AMD=y
 CONFIG_HIGHPTE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_INTEL=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_PCIE is not set
diff --git a/meta/cfg/kernel-cache/cfg/x86_64.cfg b/meta/cfg/kernel-cache/cfg/x86_64.cfg
index 2050c22..c45f496 100644
--- a/meta/cfg/kernel-cache/cfg/x86_64.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86_64.cfg
@@ -1,6 +1,13 @@
 # Config settings specific to x86_64 and not in an existing cfg/foo.cfg
+CONFIG_X86=y
+CONFIG_64BIT=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_INTEL=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_PCIE is not set
-- 
1.7.9.5