mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 04:58:26 +00:00
Code Issues Projects Releases Wiki Activity

yocto-bsp: Update substrate to use the new x86 tune files

Browse Source 
Update the substrates to use x86-base instead of ia32-base and core2-64
instead of x86-64. Update the core2 bit to include the DEFAULTTUNE to be
explicit.

(From meta-yocto rev: 3ccc079192ca147382231f0379bae1d04d47a89c)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Paul Eggleton <paul.eggleton@intel.com>
Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Nitin Kamble <nitin.a.kamble@intel.com>
Cc: Mark Hatle <mark.hatle@windriver.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Darren Hart
2014-01-21 23:35:39 +00:00
committed by Richard Purdie
parent cb2b9b546c
commit 279af938ed
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+7 -6
View File
@@ -23,9 +23,10 @@ require conf/machine/include/tune-i586.inc
{{ if tunefile == "tune_atom": }}
require conf/machine/include/tune-atom.inc
{{ if tunefile == "tune_core2": }}
DEFAULTTUNE="core2-32"
require conf/machine/include/tune-core2.inc
require conf/machine/include/ia32-base.inc
require conf/machine/include/x86-base.inc
MACHINE_FEATURES += "wifi efi pcbios"
@@ -46,14 +47,14 @@ MACHINE_FEATURES += "wifi efi pcbios"
{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }}
{{ if xserver == "y": }}
XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \
XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
{{ if xserver == "y" and xserver_choice == "xserver_vesa": }}
${XSERVER_IA32_VESA} \
${XSERVER_X86_VESA} \
{{ if xserver == "y" and xserver_choice == "xserver_i915": }}
${XSERVER_IA32_I915} \
${XSERVER_X86_I915} \
{{ if xserver == "y" and xserver_choice == "xserver_i965": }}
${XSERVER_IA32_I965} \
${XSERVER_X86_I965} \
{{ if xserver == "y": }}
"
scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
+8 -7
View File
@@ -14,8 +14,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/ia32-base.inc
DEFAULTTUNE ?= "core2-64"
require conf/machine/include/tune-core2.inc
require conf/machine/include/x86-base.inc
MACHINE_FEATURES += "wifi efi pcbios"
@@ -28,14 +29,14 @@ MACHINE_FEATURES += "wifi efi pcbios"
{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }}
{{ if xserver == "y": }}
XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \
XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
{{ if xserver == "y" and xserver_choice == "xserver_vesa": }}
${XSERVER_IA32_VESA} \
${XSERVER_X86_VESA} \
{{ if xserver == "y" and xserver_choice == "xserver_i915": }}
${XSERVER_IA32_I915} \
${XSERVER_X86_I915} \
{{ if xserver == "y" and xserver_choice == "xserver_i965": }}
${XSERVER_IA32_I965} \
${XSERVER_X86_I965} \
{{ if xserver == "y": }}
"