sys940x: Use core2-32 tuning

The E6xx (Tunnel Creek) Atom CPUs are supported by the core2 tune file.
Update the XSERVER_* variables to use the new naming.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>

2 files changed, 8 insertions, 10 deletions

diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
index 7e58655f..ed6c7f49 100644
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ b/meta-sys940x/conf/machine/sys940x-noemgd.conf
@@ -5,17 +5,16 @@
 
 #@DESCRIPTION: Machine configuration for Inforce SYS940X systems, without Intel-proprietary graphics bits
 
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-core2-32-common.inc
 
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios"
 
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+           ${XSERVER_X86_EXT} \
+           ${XSERVER_X86_VESA} \
            "
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index db2d07a8..04e77665 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -5,8 +5,7 @@
 
 #@DESCRIPTION: Machine configuration for Inforce SYS940x systems
 
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/meta-intel.inc
 require conf/machine/include/meta-intel-emgd.inc
 
@@ -19,9 +18,9 @@ MACHINE_HWCODECS ?= "va-intel"
 XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
                   emgd-gst-plugins-mixvideo gst-va-intel"
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_EMGD} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+           ${XSERVER_X86_EXT} \
+           ${XSERVER_X86_EMGD} \
            "
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"