[linux-yocto] [PATCH 3/6] x86: Move MTRR config into x86 common fragments

[Darren Hart]

MTRR is common enough it should just be included in the x86* cfg
fragments already included by these machines.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../kernel-cache/bsp/common-pc/common-pc-cpu.cfg   |    1 -
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |    1 -
 meta/cfg/kernel-cache/bsp/minnow/minnow.cfg        |    1 -
 meta/cfg/kernel-cache/cfg/x86.cfg                  |    1 +
 meta/cfg/kernel-cache/cfg/x86_64.cfg               |    1 +
 5 files changed, 2 insertions(+), 3 deletions(-)

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 7254517..3479648 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
@@ -15,5 +15,4 @@ CONFIG_MPENTIUMM=y
 CONFIG_X86_GENERIC=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
-CONFIG_MTRR=y
 CONFIG_PM=y
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
index b4cfffe..1ed21a9 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
@@ -4,7 +4,6 @@ CONFIG_PRINTK=y
 
 # Configs required for boot on this device
 CONFIG_DMI=y
-CONFIG_MTRR=y
 
 # Basic hardware support for the box - network, USB, PCI, sound
 CONFIG_ATA=y
diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg b/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
index 2be4ea4..e20fdc0 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow.cfg
@@ -3,7 +3,6 @@ CONFIG_MATOM=y
 
 # Configs required for boot on this device
 CONFIG_DMI=y
-CONFIG_MTRR=y
 
 # Basic hardware support for the box - network, USB, PCI, sound
 CONFIG_PCI=y
diff --git a/meta/cfg/kernel-cache/cfg/x86.cfg b/meta/cfg/kernel-cache/cfg/x86.cfg
index 06906b0..9edd6d2 100644
--- a/meta/cfg/kernel-cache/cfg/x86.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86.cfg
@@ -11,6 +11,7 @@ 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
diff --git a/meta/cfg/kernel-cache/cfg/x86_64.cfg b/meta/cfg/kernel-cache/cfg/x86_64.cfg
index c45f496..5133fc2 100644
--- a/meta/cfg/kernel-cache/cfg/x86_64.cfg
+++ b/meta/cfg/kernel-cache/cfg/x86_64.cfg
@@ -8,6 +8,7 @@ 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
-- 
1.7.9.5