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 | |
| parent | cb2b9b546cb6a47afc50ec354f37682f4cec6b9a (diff) | |
| download | openembedded-core-contrib-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')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 13 | ||||
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf | 15 |
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 {{ 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 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}}" 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": }} " |