From f68532b366f9dbf7a4dd4d699d69e8675c1e2b7a Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 21 Jan 2014 20:59:13 -0800 Subject: fri2: 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 --- meta-fri2/conf/machine/fri2-noemgd.conf | 9 ++++----- meta-fri2/conf/machine/fri2.conf | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'meta-fri2/conf') diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 29aa6010..43676b30 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf @@ -5,8 +5,7 @@ #@DESCRIPTION: Machine configuration for Fish River Island II 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 MACHINE_FEATURES += "wifi 3g pcbios efi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" @@ -14,9 +13,9 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.10%" -XSERVER ?= "${XSERVER_IA32_BASE} \ - ${XSERVER_IA32_EXT} \ - ${XSERVER_IA32_FBDEV} \ +XSERVER ?= "${XSERVER_X86_BASE} \ + ${XSERVER_X86_EXT} \ + ${XSERVER_X86_FBDEV} \ " # Syslinux does not know about the 64MHz uart clock and it does not detect the diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 4ffdc4eb..83072d3b 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -5,8 +5,7 @@ #@DESCRIPTION: Machine configuration for Fish River Island II 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 @@ -20,9 +19,9 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.10%" -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" -- cgit v1.2.3-54-g00ecf