romley: Use corei7 tuning

Sandy Bridge and Ivy Bridge based CPUs benefit from the new corei7 tune file.
Update the XSERVER_* variables to use the new naming.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Haw Foo Chien <foo.chien.haw@intel.com>
Cc: Ong Boon Leong <boon.leong.ong@intel.com>

2 files changed, 8 insertions, 10 deletions

diff --git a/meta-romley/conf/machine/romley-ivb.conf b/meta-romley/conf/machine/romley-ivb.conf
index 708361d4..f977c302 100644
--- a/meta-romley/conf/machine/romley-ivb.conf
+++ b/meta-romley/conf/machine/romley-ivb.conf
@@ -10,11 +10,10 @@
 
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-require conf/machine/include/tune-x86_64.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/meta-intel.inc
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_MATROX_MGA} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+           ${XSERVER_X86_EXT} \
+           ${XSERVER_X86_MATROX_MGA} \
            "
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index 1c5453cf..60d2ca15 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -10,11 +10,10 @@
 
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-require conf/machine/include/tune-x86_64.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/meta-intel.inc
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_MATROX_MGA} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+           ${XSERVER_X86_EXT} \
+           ${XSERVER_X86_MATROX_MGA} \
            "