Patchwork [16/19] yocto-bsp: Update substrate to use the new x86 tune files

login
register
mail settings
Submitter Darren Hart
Date Jan. 22, 2014, 12:59 a.m.
Message ID <897fcd84cce388aa82969568f9c3b016aa132384.1390351667.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/65467/
State New
Headers show

Comments

Darren Hart - Jan. 22, 2014, 12:59 a.m.
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.

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>
---
 .../arch/i386/conf/machine/{{=machine}}.conf       |   13 +++++++------
 .../arch/x86_64/conf/machine/{{=machine}}.conf     |   15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

Patch

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 b06ba12..2fff9b7 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
 {{ 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": }}
            "
 
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 2bf2226..6685d07 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}}"
 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": }}
            "