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/i386 | |
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/i386')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf index b06ba12497..2fff9b7e92 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | |||
@@ -23,9 +23,10 @@ require conf/machine/include/tune-i586.inc | |||
23 | {{ if tunefile == "tune_atom": }} | 23 | {{ if tunefile == "tune_atom": }} |
24 | require conf/machine/include/tune-atom.inc | 24 | require conf/machine/include/tune-atom.inc |
25 | {{ if tunefile == "tune_core2": }} | 25 | {{ if tunefile == "tune_core2": }} |
26 | DEFAULTTUNE="core2-32" | ||
26 | require conf/machine/include/tune-core2.inc | 27 | require conf/machine/include/tune-core2.inc |
27 | 28 | ||
28 | require conf/machine/include/ia32-base.inc | 29 | require conf/machine/include/x86-base.inc |
29 | 30 | ||
30 | MACHINE_FEATURES += "wifi efi pcbios" | 31 | MACHINE_FEATURES += "wifi efi pcbios" |
31 | 32 | ||
@@ -46,14 +47,14 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
46 | {{ 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" }} | 47 | {{ 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" }} |
47 | 48 | ||
48 | {{ if xserver == "y": }} | 49 | {{ if xserver == "y": }} |
49 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 50 | XSERVER ?= "${XSERVER_X86_BASE} \ |
50 | ${XSERVER_IA32_EXT} \ | 51 | ${XSERVER_X86_EXT} \ |
51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} | 52 | {{ if xserver == "y" and xserver_choice == "xserver_vesa": }} |
52 | ${XSERVER_IA32_VESA} \ | 53 | ${XSERVER_X86_VESA} \ |
53 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} | 54 | {{ if xserver == "y" and xserver_choice == "xserver_i915": }} |
54 | ${XSERVER_IA32_I915} \ | 55 | ${XSERVER_X86_I915} \ |
55 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} | 56 | {{ if xserver == "y" and xserver_choice == "xserver_i965": }} |
56 | ${XSERVER_IA32_I965} \ | 57 | ${XSERVER_X86_I965} \ |
57 | {{ if xserver == "y": }} | 58 | {{ if xserver == "y": }} |
58 | " | 59 | " |
59 | 60 | ||