diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-01-21 23:35:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:51:57 +0000 |
commit | 279af938edd033075be91b89668c10ac26373de6 (patch) | |
tree | c1be43e4d95a98a7ce202dfc484ef02f5cf3a1dc /scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | |
parent | cb2b9b546cb6a47afc50ec354f37682f4cec6b9a (diff) | |
download | poky-279af938edd033075be91b89668c10ac26373de6.tar.gz |
yocto-bsp: Update substrate to use the new x86 tune files
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>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf index 2bf2226f18..6685d07ab2 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | |||
@@ -14,8 +14,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | |||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 14 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
15 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 15 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
16 | 16 | ||
17 | require conf/machine/include/tune-x86_64.inc | 17 | DEFAULTTUNE ?= "core2-64" |
18 | require conf/machine/include/ia32-base.inc | 18 | require conf/machine/include/tune-core2.inc |
19 | require conf/machine/include/x86-base.inc | ||
19 | 20 | ||
20 | MACHINE_FEATURES += "wifi efi pcbios" | 21 | MACHINE_FEATURES += "wifi efi pcbios" |
21 | 22 | ||
@@ -28,14 +29,14 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
28 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 29 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
29 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} | 30 | {{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} |
30 | {{ if xserver == "y": }} | 31 | {{ if xserver == "y": }} |
31 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 32 | XSERVER ?= "${XSERVER_X86_BASE} \ |
32 | ${XSERVER_IA32_EXT} \ | 33 | ${XSERVER_X86_EXT} \ |
33 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 34 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
34 | ${XSERVER_IA32_VESA} \ | 35 | ${XSERVER_X86_VESA} \ |
35 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 36 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} |
36 | ${XSERVER_IA32_I915} \ | 37 | ${XSERVER_X86_I915} \ |
37 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 38 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
38 | ${XSERVER_IA32_I965} \ | 39 | ${XSERVER_X86_I965} \ |
39 | {{ if xserver == "y": }} | 40 | {{ if xserver == "y": }} |
40 | " | 41 | " |
41 | 42 | ||