diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-01-21 20:59:13 -0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-01-27 16:56:13 -0800 |
| commit | f68532b366f9dbf7a4dd4d699d69e8675c1e2b7a (patch) | |
| tree | 950d96c3e30ca2797e00a0a19a501f468b5bd69b /meta-fri2/conf | |
| parent | 584176c58868fcf821ed78ed142054afd02fd817 (diff) | |
| download | meta-intel-f68532b366f9dbf7a4dd4d699d69e8675c1e2b7a.tar.gz | |
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 <dvhart@linux.intel.com>
Diffstat (limited to 'meta-fri2/conf')
| -rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 9 | ||||
| -rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 9 |
2 files changed, 8 insertions, 10 deletions
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 @@ | |||
| 5 | 5 | ||
| 6 | #@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits | 6 | #@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits |
| 7 | 7 | ||
| 8 | require conf/machine/include/tune-atom.inc | 8 | require conf/machine/include/intel-core2-32-common.inc |
| 9 | require conf/machine/include/ia32-base.inc | ||
| 10 | 9 | ||
| 11 | MACHINE_FEATURES += "wifi 3g pcbios efi" | 10 | MACHINE_FEATURES += "wifi 3g pcbios efi" |
| 12 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| @@ -14,9 +13,9 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | |||
| 14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 15 | PREFERRED_VERSION_linux-yocto = "3.10%" | 14 | PREFERRED_VERSION_linux-yocto = "3.10%" |
| 16 | 15 | ||
| 17 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 16 | XSERVER ?= "${XSERVER_X86_BASE} \ |
| 18 | ${XSERVER_IA32_EXT} \ | 17 | ${XSERVER_X86_EXT} \ |
| 19 | ${XSERVER_IA32_FBDEV} \ | 18 | ${XSERVER_X86_FBDEV} \ |
| 20 | " | 19 | " |
| 21 | 20 | ||
| 22 | # Syslinux does not know about the 64MHz uart clock and it does not detect the | 21 | # 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 @@ | |||
| 5 | 5 | ||
| 6 | #@DESCRIPTION: Machine configuration for Fish River Island II systems | 6 | #@DESCRIPTION: Machine configuration for Fish River Island II systems |
| 7 | 7 | ||
| 8 | require conf/machine/include/tune-atom.inc | 8 | require conf/machine/include/intel-core2-32-common.inc |
| 9 | require conf/machine/include/ia32-base.inc | ||
| 10 | require conf/machine/include/meta-intel.inc | 9 | require conf/machine/include/meta-intel.inc |
| 11 | require conf/machine/include/meta-intel-emgd.inc | 10 | require conf/machine/include/meta-intel-emgd.inc |
| 12 | 11 | ||
| @@ -20,9 +19,9 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | |||
| 20 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 21 | PREFERRED_VERSION_linux-yocto = "3.10%" | 20 | PREFERRED_VERSION_linux-yocto = "3.10%" |
| 22 | 21 | ||
| 23 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 22 | XSERVER ?= "${XSERVER_X86_BASE} \ |
| 24 | ${XSERVER_IA32_EXT} \ | 23 | ${XSERVER_X86_EXT} \ |
| 25 | ${XSERVER_IA32_EMGD} \ | 24 | ${XSERVER_X86_EMGD} \ |
| 26 | " | 25 | " |
| 27 | 26 | ||
| 28 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 27 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |