mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
conf/machine: move tune files to architecture directories
Move all of the tune files found in conf/machine/include into their respective architecture directories in that same location. All references to these will need to be updated. So, change the relevant ones for this tree in this commit as well. For the ARM tunes, nest them one further into armv8a, armv8m, etc. and rename some to make them uniform with the rest of the tunes. (From OE-Core rev: b6f15209bcfff953cce69da97a93f9ddff141ced) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jon Mason
committed by
Richard Purdie
Richard Purdie
parent
d9878e12b8
commit
1d381f21f5
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "mips32r2-24kc"
|
||||
|
||||
MIPSPKGSFX_MIPS16E ??= ""
|
||||
|
||||
require conf/machine/include/tune-mips32r2.inc
|
||||
require conf/machine/include/mips/tune-mips32r2.inc
|
||||
require conf/machine/include/mips/feature-mips-mips16e.inc
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "mips32r2-74kc"
|
||||
|
||||
MIPSPKGSFX_MIPS16E ??= ""
|
||||
|
||||
require conf/machine/include/tune-mips32r2.inc
|
||||
require conf/machine/include/mips/tune-mips32r2.inc
|
||||
require conf/machine/include/mips/feature-mips-mips16e.inc
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DEFAULTTUNE ?= "mips32r2"
|
||||
|
||||
require conf/machine/include/tune-mips32.inc
|
||||
require conf/machine/include/mips/tune-mips32.inc
|
||||
|
||||
TUNEVALID[mips32r2] = "Enable mips32r2 specific processor optimizations"
|
||||
TUNECONFLICTS[mips32r2] = "n64 n32"
|
||||
3
meta/conf/machine/include/mips/tune-mips64.inc
Normal file
3
meta/conf/machine/include/mips/tune-mips64.inc
Normal file
@@ -0,0 +1,3 @@
|
||||
DEFAULTTUNE ?= "mips64"
|
||||
|
||||
require conf/machine/include/mips/tune-mips32r2.inc
|
||||
@@ -1,6 +1,6 @@
|
||||
DEFAULTTUNE ?= "mips64r2"
|
||||
|
||||
require conf/machine/include/tune-mips64.inc
|
||||
require conf/machine/include/mips/tune-mips64.inc
|
||||
|
||||
TUNEVALID[mips64r2] = "Enable mips64r2 specific processor optimizations"
|
||||
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips64r2', ' -march=mips64r2', '', d)}"
|
||||
@@ -1,6 +1,6 @@
|
||||
DEFAULTTUNE ?="octeon2"
|
||||
|
||||
require conf/machine/include/tune-mips64.inc
|
||||
require conf/machine/include/mips/tune-mips64.inc
|
||||
|
||||
AVAILTUNES += "octeon2 octeon2_64 octeon3 octeon3_64"
|
||||
|
||||
@@ -6,7 +6,7 @@ require conf/machine/include/sh/arch-sh.inc
|
||||
TUNEVALID[sh4] = "Enable SH4 optimizations"
|
||||
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh4', ' -m4', '', d)}"
|
||||
|
||||
# NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc.
|
||||
# NOTE: If you want to optimize to sh4a, conf/machine/include/sh/tune-sh4a.inc.
|
||||
# But it is not compatible for sh4.
|
||||
# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only.
|
||||
TUNEVALID[sh4a] = "Enable SH4a optimizations"
|
||||
@@ -1,3 +0,0 @@
|
||||
DEFAULTTUNE ?= "mips64"
|
||||
|
||||
require conf/machine/include/tune-mips32r2.inc
|
||||
@@ -1,2 +1,2 @@
|
||||
# Atom tunings are the same as core2 for now...
|
||||
require conf/machine/include/tune-core2.inc
|
||||
require conf/machine/include/x86/tune-core2.inc
|
||||
@@ -9,7 +9,7 @@
|
||||
DEFAULTTUNE ?= "core2-32"
|
||||
|
||||
# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
|
||||
require conf/machine/include/tune-i686.inc
|
||||
require conf/machine/include/x86/tune-i686.inc
|
||||
|
||||
# Extra tune features
|
||||
TUNEVALID[core2] = "Enable core2 specific processor optimizations"
|
||||
@@ -9,7 +9,7 @@
|
||||
DEFAULTTUNE ?= "corei7-64"
|
||||
|
||||
# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
|
||||
require conf/machine/include/tune-core2.inc
|
||||
require conf/machine/include/x86/tune-core2.inc
|
||||
|
||||
# Extra tune features
|
||||
TUNEVALID[corei7] = "Enable corei7 specific processor optimizations"
|
||||
@@ -13,7 +13,7 @@ DEFAULTTUNE ?= "i686"
|
||||
X86ARCH32 ?= "i686"
|
||||
|
||||
# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
|
||||
require conf/machine/include/tune-i586.inc
|
||||
require conf/machine/include/x86/tune-i586.inc
|
||||
|
||||
# Extra tune features
|
||||
TUNEVALID[i686] = "Enable i686 specific processor optimizations"
|
||||
@@ -2,7 +2,7 @@
|
||||
#@NAME: QEMU Arm Cortex-A15 machine
|
||||
#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU
|
||||
|
||||
require conf/machine/include/tune-cortexa15.inc
|
||||
require conf/machine/include/arm/armv7a/tune-cortexa15.inc
|
||||
require conf/machine/include/qemu.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "zImage"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#@NAME: QEMU ARMv8 machine
|
||||
#@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU
|
||||
|
||||
require conf/machine/include/tune-cortexa57.inc
|
||||
require conf/machine/include/arm/armv8a/tune-cortexa57.inc
|
||||
require conf/machine/include/qemu.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "Image"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#@DESCRIPTION: Machine configuration for running an ARMv5 system on QEMU
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-arm926ejs.inc
|
||||
require conf/machine/include/arm/armv5/tune-arm926ejs.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "zImage"
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#@DESCRIPTION: Machine configuration for running a MIPS system on QEMU
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-mips32r2.inc
|
||||
require conf/machine/include/qemuboot-mips.inc
|
||||
require conf/machine/include/mips/tune-mips32r2.inc
|
||||
require conf/machine/include/mips/qemuboot-mips.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "vmlinux"
|
||||
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#@DESCRIPTION: Machine configuration for running a MIPS64 system on QEMU
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-mips64r2.inc
|
||||
require conf/machine/include/qemuboot-mips.inc
|
||||
require conf/machine/include/mips/tune-mips64r2.inc
|
||||
require conf/machine/include/mips/qemuboot-mips.inc
|
||||
|
||||
QB_CPU = "-cpu MIPS64R2-generic"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#@DESCRIPTION: Machine configuration for running a PPC system on QEMU
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-ppc7400.inc
|
||||
require conf/machine/include/powerpc/tune-ppc7400.inc
|
||||
|
||||
TARGET_CC_KERNEL_ARCH = "-mno-spe"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#@DESCRIPTION: Machine configuration for running a PPC system on QEMU
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-power9.inc
|
||||
require conf/machine/include/powerpc/tune-power9.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "vmlinux"
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
DEFAULTTUNE ?= "core2-64"
|
||||
require conf/machine/include/tune-core2.inc
|
||||
require conf/machine/include/qemuboot-x86.inc
|
||||
require conf/machine/include/x86/tune-core2.inc
|
||||
require conf/machine/include/x86/qemuboot-x86.inc
|
||||
|
||||
UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
DEFAULTTUNE ?= "core2-32"
|
||||
require conf/machine/include/tune-corei7.inc
|
||||
require conf/machine/include/qemuboot-x86.inc
|
||||
require conf/machine/include/x86/tune-corei7.inc
|
||||
require conf/machine/include/x86/qemuboot-x86.inc
|
||||
|
||||
UBOOT_MACHINE ?= "qemu-x86_defconfig"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user