summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-01-21 23:35:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:51:57 +0000
commit279af938edd033075be91b89668c10ac26373de6 (patch)
treec1be43e4d95a98a7ce202dfc484ef02f5cf3a1dc
parentcb2b9b546cb6a47afc50ec354f37682f4cec6b9a (diff)
downloadpoky-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>
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf13
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf15
2 files changed, 15 insertions, 13 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": }}
24require conf/machine/include/tune-atom.inc 24require conf/machine/include/tune-atom.inc
25{{ if tunefile == "tune_core2": }} 25{{ if tunefile == "tune_core2": }}
26DEFAULTTUNE="core2-32"
26require conf/machine/include/tune-core2.inc 27require conf/machine/include/tune-core2.inc
27 28
28require conf/machine/include/ia32-base.inc 29require conf/machine/include/x86-base.inc
29 30
30MACHINE_FEATURES += "wifi efi pcbios" 31MACHINE_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": }}
49XSERVER ?= "${XSERVER_IA32_BASE} \ 50XSERVER ?= "${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
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}}"
14PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" 14PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
15PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" 15PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
16 16
17require conf/machine/include/tune-x86_64.inc 17DEFAULTTUNE ?= "core2-64"
18require conf/machine/include/ia32-base.inc 18require conf/machine/include/tune-core2.inc
19require conf/machine/include/x86-base.inc
19 20
20MACHINE_FEATURES += "wifi efi pcbios" 21MACHINE_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": }}
31XSERVER ?= "${XSERVER_IA32_BASE} \ 32XSERVER ?= "${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