[linux-yocto] [PATCH v4 04/14] cfg/x86*: refactor to use x86_base

[Saul Wold]

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/cfg/kernel-cache/cfg/x86.cfg    | 14 --------------
 meta/cfg/kernel-cache/cfg/x86.scc    |  4 +---
 meta/cfg/kernel-cache/cfg/x86_64.cfg | 13 -------------
 meta/cfg/kernel-cache/cfg/x86_64.scc |  4 +---
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/meta/cfg/kernel-cache/cfg/x86.cfg b/meta/cfg/kernel-cache/cfg/x86.cfg
index 9edd6d2..d346c1d 100644
--- a/meta/cfg/kernel-cache/cfg/x86.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86.cfg
@@ -1,18 +1,4 @@
 # 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_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=y
-# CONFIG_MTRR_SANITIZER is not set
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-CONFIG_PCI_MSI=y
diff --git a/meta/cfg/kernel-cache/cfg/x86.scc b/meta/cfg/kernel-cache/cfg/x86.scc
index b272ffd..c7dd66a 100644
--- a/meta/cfg/kernel-cache/cfg/x86.scc
+++ b/meta/cfg/kernel-cache/cfg/x86.scc
@@ -1,6 +1,4 @@
-include efi.scc
+include x86_base.scc
 include smp.scc
-include timer/hpet.scc
-include timer/no_hz.scc
 include timer/hz_1000.scc
 kconf hardware x86.cfg
diff --git a/meta/cfg/kernel-cache/cfg/x86_64.cfg b/meta/cfg/kernel-cache/cfg/x86_64.cfg
index f6dab86..2b66de3 100644
--- a/meta/cfg/kernel-cache/cfg/x86_64.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86_64.cfg
@@ -1,18 +1,5 @@
 # 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=y
-# CONFIG_MTRR_SANITIZER is not set
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-CONFIG_PCI_MSI=y
 
 # Support running 32 bit binaries
 CONFIG_IA32_EMULATION=y
diff --git a/meta/cfg/kernel-cache/cfg/x86_64.scc b/meta/cfg/kernel-cache/cfg/x86_64.scc
index eed35f9..e792ac3 100644
--- a/meta/cfg/kernel-cache/cfg/x86_64.scc
+++ b/meta/cfg/kernel-cache/cfg/x86_64.scc
@@ -1,6 +1,4 @@
-include efi.scc
+include x86_base.scc
 include smp.scc
-include timer/hpet.scc
-include timer/no_hz.scc
 include timer/hz_1000.scc
 kconf hardware x86_64.cfg
-- 
2.1.0