2 files changed, 8 insertions, 10 deletions

diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 1ced7c67..42bbfb12 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -8,12 +8,11 @@
 
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-require conf/machine/include/tune-atom.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/intel-core2-32-common.inc
 
-XSERVER ?= "${XSERVER_IA32_BASE} \
-           ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
+XSERVER ?= "${XSERVER_X86_BASE} \
+           ${XSERVER_X86_EXT} \
+           ${XSERVER_X86_VESA} \
            "
 
 APPEND += "video=vesafb vga=0x318"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 20fff973..9298ef2e 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -8,8 +8,7 @@
 
 PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-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"