summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2021-08-16 22:01:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-18 16:01:06 (GMT)
commit1d381f21f5f13aa0c4e1a45683ed656ebeedd37d (patch)
tree457112a9d6561423bab62effe4e46ebc7988dfc2 /meta/conf
parentd9878e12b8b78074be1019679ce078940a79c875 (diff)
downloadpoky-1d381f21f5f13aa0c4e1a45683ed656ebeedd37d.tar.gz
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>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/arm/armv4/tune-arm920t.inc (renamed from meta/conf/machine/include/tune-arm920t.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv4/tune-arm9tdmi.inc (renamed from meta/conf/machine/include/tune-arm9tdmi.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv4/tune-ep9312.inc (renamed from meta/conf/machine/include/tune-ep9312.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv4/tune-strongarm1100.inc (renamed from meta/conf/machine/include/tune-strongarm1100.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv5/tune-arm926ejs.inc (renamed from meta/conf/machine/include/tune-arm926ejs.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv5/tune-iwmmxt.inc (renamed from meta/conf/machine/include/tune-iwmmxt.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv5/tune-xscale.inc (renamed from meta/conf/machine/include/tune-xscale.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv6/tune-arm1136jf-s.inc (renamed from meta/conf/machine/include/tune-arm1136jf-s.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv6/tune-arm1176jz-s.inc (renamed from meta/conf/machine/include/tune-arm1176jz-s.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv6m/tune-cortexm0.inc (renamed from meta/conf/machine/include/tune-cortex-m0.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv6m/tune-cortexm0plus.inc (renamed from meta/conf/machine/include/tune-cortex-m0plus.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv6m/tune-cortexm1.inc (renamed from meta/conf/machine/include/tune-cortexm1.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa15.inc (renamed from meta/conf/machine/include/tune-cortexa15.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa17.inc (renamed from meta/conf/machine/include/tune-cortexa17.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa5.inc (renamed from meta/conf/machine/include/tune-cortexa5.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa7.inc (renamed from meta/conf/machine/include/tune-cortexa7.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa8.inc (renamed from meta/conf/machine/include/tune-cortexa8.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7a/tune-cortexa9.inc (renamed from meta/conf/machine/include/tune-cortexa9.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7m/tune-cortexm3.inc (renamed from meta/conf/machine/include/tune-cortexm3.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7m/tune-cortexm4.inc (renamed from meta/conf/machine/include/tune-cortexm4.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv7m/tune-cortexm7.inc (renamed from meta/conf/machine/include/tune-cortexm7.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8-2a/tune-cortexa55.inc (renamed from meta/conf/machine/include/tune-cortexa55.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc (renamed from meta/conf/machine/include/tune-cortexa32.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa35.inc (renamed from meta/conf/machine/include/tune-cortexa35.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa53.inc (renamed from meta/conf/machine/include/tune-cortexa53.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa57-cortexa53.inc (renamed from meta/conf/machine/include/tune-cortexa57-cortexa53.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa57.inc (renamed from meta/conf/machine/include/tune-cortexa57.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc (renamed from meta/conf/machine/include/tune-cortexa72-cortexa53.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa72.inc (renamed from meta/conf/machine/include/tune-cortexa72.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa53.inc (renamed from meta/conf/machine/include/tune-cortexa73-cortexa53.inc)0
-rw-r--r--meta/conf/machine/include/arm/armv8a/tune-thunderx.inc (renamed from meta/conf/machine/include/tune-thunderx.inc)0
-rw-r--r--meta/conf/machine/include/m68k/tune-mcf5441x.inc (renamed from meta/conf/machine/include/tune-mcf5441x.inc)0
-rw-r--r--meta/conf/machine/include/microblaze/tune-microblaze.inc (renamed from meta/conf/machine/include/tune-microblaze.inc)0
-rw-r--r--meta/conf/machine/include/mips/qemuboot-mips.inc (renamed from meta/conf/machine/include/qemuboot-mips.inc)0
-rw-r--r--meta/conf/machine/include/mips/tune-mips-24k.inc2
-rw-r--r--meta/conf/machine/include/mips/tune-mips-74k.inc2
-rw-r--r--meta/conf/machine/include/mips/tune-mips32.inc (renamed from meta/conf/machine/include/tune-mips32.inc)0
-rw-r--r--meta/conf/machine/include/mips/tune-mips32r2.inc (renamed from meta/conf/machine/include/tune-mips32r2.inc)2
-rw-r--r--meta/conf/machine/include/mips/tune-mips32r6.inc (renamed from meta/conf/machine/include/tune-mips32r6.inc)0
-rw-r--r--meta/conf/machine/include/mips/tune-mips64.inc3
-rw-r--r--meta/conf/machine/include/mips/tune-mips64r2.inc (renamed from meta/conf/machine/include/tune-mips64r2.inc)2
-rw-r--r--meta/conf/machine/include/mips/tune-mips64r6.inc (renamed from meta/conf/machine/include/tune-mips64r6.inc)0
-rw-r--r--meta/conf/machine/include/mips/tune-octeon.inc (renamed from meta/conf/machine/include/tune-octeon.inc)2
-rw-r--r--meta/conf/machine/include/powerpc/tune-power5.inc (renamed from meta/conf/machine/include/tune-power5.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-power6.inc (renamed from meta/conf/machine/include/tune-power6.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-power7.inc (renamed from meta/conf/machine/include/tune-power7.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-power9.inc (renamed from meta/conf/machine/include/tune-power9.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppc476.inc (renamed from meta/conf/machine/include/tune-ppc476.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppc603e.inc (renamed from meta/conf/machine/include/tune-ppc603e.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppc7400.inc (renamed from meta/conf/machine/include/tune-ppc7400.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce300c2.inc (renamed from meta/conf/machine/include/tune-ppce300c2.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce300c3.inc (renamed from meta/conf/machine/include/tune-ppce300c3.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce500.inc (renamed from meta/conf/machine/include/tune-ppce500.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce500mc.inc (renamed from meta/conf/machine/include/tune-ppce500mc.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce500v2.inc (renamed from meta/conf/machine/include/tune-ppce500v2.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce5500.inc (renamed from meta/conf/machine/include/tune-ppce5500.inc)0
-rw-r--r--meta/conf/machine/include/powerpc/tune-ppce6500.inc (renamed from meta/conf/machine/include/tune-ppce6500.inc)0
-rw-r--r--meta/conf/machine/include/sh/tune-sh3.inc (renamed from meta/conf/machine/include/tune-sh3.inc)0
-rw-r--r--meta/conf/machine/include/sh/tune-sh4.inc (renamed from meta/conf/machine/include/tune-sh4.inc)2
-rw-r--r--meta/conf/machine/include/tune-mips64.inc3
-rw-r--r--meta/conf/machine/include/x86/qemuboot-x86.inc (renamed from meta/conf/machine/include/qemuboot-x86.inc)0
-rw-r--r--meta/conf/machine/include/x86/tune-atom.inc (renamed from meta/conf/machine/include/tune-atom.inc)2
-rw-r--r--meta/conf/machine/include/x86/tune-c3.inc (renamed from meta/conf/machine/include/tune-c3.inc)0
-rw-r--r--meta/conf/machine/include/x86/tune-core2.inc (renamed from meta/conf/machine/include/tune-core2.inc)2
-rw-r--r--meta/conf/machine/include/x86/tune-corei7.inc (renamed from meta/conf/machine/include/tune-corei7.inc)2
-rw-r--r--meta/conf/machine/include/x86/tune-i586-nlp.inc (renamed from meta/conf/machine/include/tune-i586-nlp.inc)0
-rw-r--r--meta/conf/machine/include/x86/tune-i586.inc (renamed from meta/conf/machine/include/tune-i586.inc)0
-rw-r--r--meta/conf/machine/include/x86/tune-i686.inc (renamed from meta/conf/machine/include/tune-i686.inc)2
-rw-r--r--meta/conf/machine/include/x86/x86-base.inc (renamed from meta/conf/machine/include/x86-base.inc)0
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarm64.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
-rw-r--r--meta/conf/machine/qemumips.conf4
-rw-r--r--meta/conf/machine/qemumips64.conf4
-rw-r--r--meta/conf/machine/qemuppc.conf2
-rw-r--r--meta/conf/machine/qemuppc64.conf2
-rw-r--r--meta/conf/machine/qemux86-64.conf4
-rw-r--r--meta/conf/machine/qemux86.conf4
78 files changed, 26 insertions, 26 deletions
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/arm/armv4/tune-arm920t.inc
index 8a61579..8a61579 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/arm/armv4/tune-arm920t.inc
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/arm/armv4/tune-arm9tdmi.inc
index 5ab286b..5ab286b 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/arm/armv4/tune-arm9tdmi.inc
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/arm/armv4/tune-ep9312.inc
index 0d481d3..0d481d3 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/arm/armv4/tune-ep9312.inc
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/arm/armv4/tune-strongarm1100.inc
index 6f5033b..6f5033b 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/arm/armv4/tune-strongarm1100.inc
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/arm/armv5/tune-arm926ejs.inc
index 84c5084..84c5084 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/arm/armv5/tune-arm926ejs.inc
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/arm/armv5/tune-iwmmxt.inc
index c584b47..c584b47 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/arm/armv5/tune-iwmmxt.inc
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/arm/armv5/tune-xscale.inc
index cc67dcd..cc67dcd 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/arm/armv5/tune-xscale.inc
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/arm/armv6/tune-arm1136jf-s.inc
index b848580..b848580 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/arm/armv6/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/include/tune-arm1176jz-s.inc b/meta/conf/machine/include/arm/armv6/tune-arm1176jz-s.inc
index 21d77f0..21d77f0 100644
--- a/meta/conf/machine/include/tune-arm1176jz-s.inc
+++ b/meta/conf/machine/include/arm/armv6/tune-arm1176jz-s.inc
diff --git a/meta/conf/machine/include/tune-cortex-m0.inc b/meta/conf/machine/include/arm/armv6m/tune-cortexm0.inc
index aadc532..aadc532 100644
--- a/meta/conf/machine/include/tune-cortex-m0.inc
+++ b/meta/conf/machine/include/arm/armv6m/tune-cortexm0.inc
diff --git a/meta/conf/machine/include/tune-cortex-m0plus.inc b/meta/conf/machine/include/arm/armv6m/tune-cortexm0plus.inc
index a3cf3f0..a3cf3f0 100644
--- a/meta/conf/machine/include/tune-cortex-m0plus.inc
+++ b/meta/conf/machine/include/arm/armv6m/tune-cortexm0plus.inc
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/arm/armv6m/tune-cortexm1.inc
index 16661f3..16661f3 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/arm/armv6m/tune-cortexm1.inc
diff --git a/meta/conf/machine/include/tune-cortexa15.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa15.inc
index 66bc124..66bc124 100644
--- a/meta/conf/machine/include/tune-cortexa15.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa15.inc
diff --git a/meta/conf/machine/include/tune-cortexa17.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa17.inc
index 324673d..324673d 100644
--- a/meta/conf/machine/include/tune-cortexa17.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa17.inc
diff --git a/meta/conf/machine/include/tune-cortexa5.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa5.inc
index 817eb16..817eb16 100644
--- a/meta/conf/machine/include/tune-cortexa5.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa5.inc
diff --git a/meta/conf/machine/include/tune-cortexa7.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa7.inc
index 5384369..5384369 100644
--- a/meta/conf/machine/include/tune-cortexa7.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa7.inc
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa8.inc
index e27002a..e27002a 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa8.inc
diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/arm/armv7a/tune-cortexa9.inc
index d046a11..d046a11 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/meta/conf/machine/include/arm/armv7a/tune-cortexa9.inc
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/arm/armv7m/tune-cortexm3.inc
index a6cb566..a6cb566 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/arm/armv7m/tune-cortexm3.inc
diff --git a/meta/conf/machine/include/tune-cortexm4.inc b/meta/conf/machine/include/arm/armv7m/tune-cortexm4.inc
index e86622f..e86622f 100644
--- a/meta/conf/machine/include/tune-cortexm4.inc
+++ b/meta/conf/machine/include/arm/armv7m/tune-cortexm4.inc
diff --git a/meta/conf/machine/include/tune-cortexm7.inc b/meta/conf/machine/include/arm/armv7m/tune-cortexm7.inc
index 6434ec6..6434ec6 100644
--- a/meta/conf/machine/include/tune-cortexm7.inc
+++ b/meta/conf/machine/include/arm/armv7m/tune-cortexm7.inc
diff --git a/meta/conf/machine/include/tune-cortexa55.inc b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
index d130b4b..d130b4b 100644
--- a/meta/conf/machine/include/tune-cortexa55.inc
+++ b/meta/conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
diff --git a/meta/conf/machine/include/tune-cortexa32.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc
index c7b01a2..c7b01a2 100644
--- a/meta/conf/machine/include/tune-cortexa32.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc
diff --git a/meta/conf/machine/include/tune-cortexa35.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa35.inc
index 33afb19..33afb19 100644
--- a/meta/conf/machine/include/tune-cortexa35.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa35.inc
diff --git a/meta/conf/machine/include/tune-cortexa53.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa53.inc
index a534ad3..a534ad3 100644
--- a/meta/conf/machine/include/tune-cortexa53.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa53.inc
diff --git a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa57-cortexa53.inc
index 7de671a..7de671a 100644
--- a/meta/conf/machine/include/tune-cortexa57-cortexa53.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa57-cortexa53.inc
diff --git a/meta/conf/machine/include/tune-cortexa57.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa57.inc
index 37650d8..37650d8 100644
--- a/meta/conf/machine/include/tune-cortexa57.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa57.inc
diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
index a77ef59..a77ef59 100644
--- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
diff --git a/meta/conf/machine/include/tune-cortexa72.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa72.inc
index 2a510bd..2a510bd 100644
--- a/meta/conf/machine/include/tune-cortexa72.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa72.inc
diff --git a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa53.inc
index 9cebffd..9cebffd 100644
--- a/meta/conf/machine/include/tune-cortexa73-cortexa53.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa73-cortexa53.inc
diff --git a/meta/conf/machine/include/tune-thunderx.inc b/meta/conf/machine/include/arm/armv8a/tune-thunderx.inc
index 7bc6282..7bc6282 100644
--- a/meta/conf/machine/include/tune-thunderx.inc
+++ b/meta/conf/machine/include/arm/armv8a/tune-thunderx.inc
diff --git a/meta/conf/machine/include/tune-mcf5441x.inc b/meta/conf/machine/include/m68k/tune-mcf5441x.inc
index 7eefce0..7eefce0 100644
--- a/meta/conf/machine/include/tune-mcf5441x.inc
+++ b/meta/conf/machine/include/m68k/tune-mcf5441x.inc
diff --git a/meta/conf/machine/include/tune-microblaze.inc b/meta/conf/machine/include/microblaze/tune-microblaze.inc
index 11f7233..11f7233 100644
--- a/meta/conf/machine/include/tune-microblaze.inc
+++ b/meta/conf/machine/include/microblaze/tune-microblaze.inc
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/mips/qemuboot-mips.inc
index 4954f30..4954f30 100644
--- a/meta/conf/machine/include/qemuboot-mips.inc
+++ b/meta/conf/machine/include/mips/qemuboot-mips.inc
diff --git a/meta/conf/machine/include/mips/tune-mips-24k.inc b/meta/conf/machine/include/mips/tune-mips-24k.inc
index ed65665..106ff62 100644
--- a/meta/conf/machine/include/mips/tune-mips-24k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-24k.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "mips32r2-24kc"
2 2
3MIPSPKGSFX_MIPS16E ??= "" 3MIPSPKGSFX_MIPS16E ??= ""
4 4
5require conf/machine/include/tune-mips32r2.inc 5require conf/machine/include/mips/tune-mips32r2.inc
6require conf/machine/include/mips/feature-mips-mips16e.inc 6require conf/machine/include/mips/feature-mips-mips16e.inc
7 7
8 8
diff --git a/meta/conf/machine/include/mips/tune-mips-74k.inc b/meta/conf/machine/include/mips/tune-mips-74k.inc
index 988cfae..e4927a1 100644
--- a/meta/conf/machine/include/mips/tune-mips-74k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-74k.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "mips32r2-74kc"
2 2
3MIPSPKGSFX_MIPS16E ??= "" 3MIPSPKGSFX_MIPS16E ??= ""
4 4
5require conf/machine/include/tune-mips32r2.inc 5require conf/machine/include/mips/tune-mips32r2.inc
6require conf/machine/include/mips/feature-mips-mips16e.inc 6require conf/machine/include/mips/feature-mips-mips16e.inc
7 7
8 8
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/mips/tune-mips32.inc
index 820087f..820087f 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/mips/tune-mips32.inc
diff --git a/meta/conf/machine/include/tune-mips32r2.inc b/meta/conf/machine/include/mips/tune-mips32r2.inc
index e7f6753..c868e92 100644
--- a/meta/conf/machine/include/tune-mips32r2.inc
+++ b/meta/conf/machine/include/mips/tune-mips32r2.inc
@@ -1,6 +1,6 @@
1DEFAULTTUNE ?= "mips32r2" 1DEFAULTTUNE ?= "mips32r2"
2 2
3require conf/machine/include/tune-mips32.inc 3require conf/machine/include/mips/tune-mips32.inc
4 4
5TUNEVALID[mips32r2] = "Enable mips32r2 specific processor optimizations" 5TUNEVALID[mips32r2] = "Enable mips32r2 specific processor optimizations"
6TUNECONFLICTS[mips32r2] = "n64 n32" 6TUNECONFLICTS[mips32r2] = "n64 n32"
diff --git a/meta/conf/machine/include/tune-mips32r6.inc b/meta/conf/machine/include/mips/tune-mips32r6.inc
index 9904cc0..9904cc0 100644
--- a/meta/conf/machine/include/tune-mips32r6.inc
+++ b/meta/conf/machine/include/mips/tune-mips32r6.inc
diff --git a/meta/conf/machine/include/mips/tune-mips64.inc b/meta/conf/machine/include/mips/tune-mips64.inc
new file mode 100644
index 0000000..a908015
--- /dev/null
+++ b/meta/conf/machine/include/mips/tune-mips64.inc
@@ -0,0 +1,3 @@
1DEFAULTTUNE ?= "mips64"
2
3require conf/machine/include/mips/tune-mips32r2.inc
diff --git a/meta/conf/machine/include/tune-mips64r2.inc b/meta/conf/machine/include/mips/tune-mips64r2.inc
index 6337abb..c644f40 100644
--- a/meta/conf/machine/include/tune-mips64r2.inc
+++ b/meta/conf/machine/include/mips/tune-mips64r2.inc
@@ -1,6 +1,6 @@
1DEFAULTTUNE ?= "mips64r2" 1DEFAULTTUNE ?= "mips64r2"
2 2
3require conf/machine/include/tune-mips64.inc 3require conf/machine/include/mips/tune-mips64.inc
4 4
5TUNEVALID[mips64r2] = "Enable mips64r2 specific processor optimizations" 5TUNEVALID[mips64r2] = "Enable mips64r2 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips64r2', ' -march=mips64r2', '', d)}" 6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips64r2', ' -march=mips64r2', '', d)}"
diff --git a/meta/conf/machine/include/tune-mips64r6.inc b/meta/conf/machine/include/mips/tune-mips64r6.inc
index b4a7e9e..b4a7e9e 100644
--- a/meta/conf/machine/include/tune-mips64r6.inc
+++ b/meta/conf/machine/include/mips/tune-mips64r6.inc
diff --git a/meta/conf/machine/include/tune-octeon.inc b/meta/conf/machine/include/mips/tune-octeon.inc
index 455c6a2..d4670e3 100644
--- a/meta/conf/machine/include/tune-octeon.inc
+++ b/meta/conf/machine/include/mips/tune-octeon.inc
@@ -1,6 +1,6 @@
1DEFAULTTUNE ?="octeon2" 1DEFAULTTUNE ?="octeon2"
2 2
3require conf/machine/include/tune-mips64.inc 3require conf/machine/include/mips/tune-mips64.inc
4 4
5AVAILTUNES += "octeon2 octeon2_64 octeon3 octeon3_64" 5AVAILTUNES += "octeon2 octeon2_64 octeon3 octeon3_64"
6 6
diff --git a/meta/conf/machine/include/tune-power5.inc b/meta/conf/machine/include/powerpc/tune-power5.inc
index e70e401..e70e401 100644
--- a/meta/conf/machine/include/tune-power5.inc
+++ b/meta/conf/machine/include/powerpc/tune-power5.inc
diff --git a/meta/conf/machine/include/tune-power6.inc b/meta/conf/machine/include/powerpc/tune-power6.inc
index eaf8951..eaf8951 100644
--- a/meta/conf/machine/include/tune-power6.inc
+++ b/meta/conf/machine/include/powerpc/tune-power6.inc
diff --git a/meta/conf/machine/include/tune-power7.inc b/meta/conf/machine/include/powerpc/tune-power7.inc
index 4531ddd..4531ddd 100644
--- a/meta/conf/machine/include/tune-power7.inc
+++ b/meta/conf/machine/include/powerpc/tune-power7.inc
diff --git a/meta/conf/machine/include/tune-power9.inc b/meta/conf/machine/include/powerpc/tune-power9.inc
index 6744731..6744731 100644
--- a/meta/conf/machine/include/tune-power9.inc
+++ b/meta/conf/machine/include/powerpc/tune-power9.inc
diff --git a/meta/conf/machine/include/tune-ppc476.inc b/meta/conf/machine/include/powerpc/tune-ppc476.inc
index 54152cb..54152cb 100644
--- a/meta/conf/machine/include/tune-ppc476.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppc476.inc
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/powerpc/tune-ppc603e.inc
index 8beec00..8beec00 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppc603e.inc
diff --git a/meta/conf/machine/include/tune-ppc7400.inc b/meta/conf/machine/include/powerpc/tune-ppc7400.inc
index 1e2c9fc..1e2c9fc 100644
--- a/meta/conf/machine/include/tune-ppc7400.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppc7400.inc
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/powerpc/tune-ppce300c2.inc
index 90171c7..90171c7 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce300c2.inc
diff --git a/meta/conf/machine/include/tune-ppce300c3.inc b/meta/conf/machine/include/powerpc/tune-ppce300c3.inc
index b74b6ad..b74b6ad 100644
--- a/meta/conf/machine/include/tune-ppce300c3.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce300c3.inc
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/powerpc/tune-ppce500.inc
index aceab32..aceab32 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce500.inc
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/powerpc/tune-ppce500mc.inc
index e3524a1..e3524a1 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce500mc.inc
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/powerpc/tune-ppce500v2.inc
index 461164d..461164d 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce500v2.inc
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/powerpc/tune-ppce5500.inc
index 2cf7b17..2cf7b17 100644
--- a/meta/conf/machine/include/tune-ppce5500.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce5500.inc
diff --git a/meta/conf/machine/include/tune-ppce6500.inc b/meta/conf/machine/include/powerpc/tune-ppce6500.inc
index e78de35..e78de35 100644
--- a/meta/conf/machine/include/tune-ppce6500.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce6500.inc
diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/sh/tune-sh3.inc
index 77d0b71..77d0b71 100644
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/meta/conf/machine/include/sh/tune-sh3.inc
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/sh/tune-sh4.inc
index e21ede3..b4893a4 100644
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/meta/conf/machine/include/sh/tune-sh4.inc
@@ -6,7 +6,7 @@ require conf/machine/include/sh/arch-sh.inc
6TUNEVALID[sh4] = "Enable SH4 optimizations" 6TUNEVALID[sh4] = "Enable SH4 optimizations"
7TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh4', ' -m4', '', d)}" 7TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'sh4', ' -m4', '', d)}"
8 8
9# NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc. 9# NOTE: If you want to optimize to sh4a, conf/machine/include/sh/tune-sh4a.inc.
10# But it is not compatible for sh4. 10# But it is not compatible for sh4.
11# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only. 11# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only.
12TUNEVALID[sh4a] = "Enable SH4a optimizations" 12TUNEVALID[sh4a] = "Enable SH4a optimizations"
diff --git a/meta/conf/machine/include/tune-mips64.inc b/meta/conf/machine/include/tune-mips64.inc
deleted file mode 100644
index 9be0e0f..0000000
--- a/meta/conf/machine/include/tune-mips64.inc
+++ /dev/null
@@ -1,3 +0,0 @@
1DEFAULTTUNE ?= "mips64"
2
3require conf/machine/include/tune-mips32r2.inc
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc
index d3b9107..d3b9107 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/x86/qemuboot-x86.inc
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/x86/tune-atom.inc
index 5e1bb74..6b84fff 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/x86/tune-atom.inc
@@ -1,2 +1,2 @@
1# Atom tunings are the same as core2 for now... 1# Atom tunings are the same as core2 for now...
2require conf/machine/include/tune-core2.inc 2require conf/machine/include/x86/tune-core2.inc
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/x86/tune-c3.inc
index afae825..afae825 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/x86/tune-c3.inc
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/x86/tune-core2.inc
index a551cad..97b7c1b 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/x86/tune-core2.inc
@@ -9,7 +9,7 @@
9DEFAULTTUNE ?= "core2-32" 9DEFAULTTUNE ?= "core2-32"
10 10
11# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS 11# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
12require conf/machine/include/tune-i686.inc 12require conf/machine/include/x86/tune-i686.inc
13 13
14# Extra tune features 14# Extra tune features
15TUNEVALID[core2] = "Enable core2 specific processor optimizations" 15TUNEVALID[core2] = "Enable core2 specific processor optimizations"
diff --git a/meta/conf/machine/include/tune-corei7.inc b/meta/conf/machine/include/x86/tune-corei7.inc
index bf1ac7a..7798288 100644
--- a/meta/conf/machine/include/tune-corei7.inc
+++ b/meta/conf/machine/include/x86/tune-corei7.inc
@@ -9,7 +9,7 @@
9DEFAULTTUNE ?= "corei7-64" 9DEFAULTTUNE ?= "corei7-64"
10 10
11# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS 11# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
12require conf/machine/include/tune-core2.inc 12require conf/machine/include/x86/tune-core2.inc
13 13
14# Extra tune features 14# Extra tune features
15TUNEVALID[corei7] = "Enable corei7 specific processor optimizations" 15TUNEVALID[corei7] = "Enable corei7 specific processor optimizations"
diff --git a/meta/conf/machine/include/tune-i586-nlp.inc b/meta/conf/machine/include/x86/tune-i586-nlp.inc
index ecfbf9f..ecfbf9f 100644
--- a/meta/conf/machine/include/tune-i586-nlp.inc
+++ b/meta/conf/machine/include/x86/tune-i586-nlp.inc
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/x86/tune-i586.inc
index b1299e9..b1299e9 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/x86/tune-i586.inc
diff --git a/meta/conf/machine/include/tune-i686.inc b/meta/conf/machine/include/x86/tune-i686.inc
index 3feb4df..293d81e 100644
--- a/meta/conf/machine/include/tune-i686.inc
+++ b/meta/conf/machine/include/x86/tune-i686.inc
@@ -13,7 +13,7 @@ DEFAULTTUNE ?= "i686"
13X86ARCH32 ?= "i686" 13X86ARCH32 ?= "i686"
14 14
15# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS 15# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
16require conf/machine/include/tune-i586.inc 16require conf/machine/include/x86/tune-i586.inc
17 17
18# Extra tune features 18# Extra tune features
19TUNEVALID[i686] = "Enable i686 specific processor optimizations" 19TUNEVALID[i686] = "Enable i686 specific processor optimizations"
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
index 958b349..958b349 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86/x86-base.inc
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index f893f1a..93d855b 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -2,7 +2,7 @@
2#@NAME: QEMU Arm Cortex-A15 machine 2#@NAME: QEMU Arm Cortex-A15 machine
3#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU 3#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU
4 4
5require conf/machine/include/tune-cortexa15.inc 5require conf/machine/include/arm/armv7a/tune-cortexa15.inc
6require conf/machine/include/qemu.inc 6require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 3dcb0d1..ea7fae2 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -2,7 +2,7 @@
2#@NAME: QEMU ARMv8 machine 2#@NAME: QEMU ARMv8 machine
3#@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU 3#@DESCRIPTION: Machine configuration for running an ARMv8 system on QEMU
4 4
5require conf/machine/include/tune-cortexa57.inc 5require conf/machine/include/arm/armv8a/tune-cortexa57.inc
6require conf/machine/include/qemu.inc 6require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index b0dc102..6c99a52 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for running an ARMv5 system on QEMU 3#@DESCRIPTION: Machine configuration for running an ARMv5 system on QEMU
4 4
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-arm926ejs.inc 6require conf/machine/include/arm/armv5/tune-arm926ejs.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
9 9
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 9b602fc..1cf21b9 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -3,8 +3,8 @@
3#@DESCRIPTION: Machine configuration for running a MIPS system on QEMU 3#@DESCRIPTION: Machine configuration for running a MIPS system on QEMU
4 4
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-mips32r2.inc 6require conf/machine/include/mips/tune-mips32r2.inc
7require conf/machine/include/qemuboot-mips.inc 7require conf/machine/include/mips/qemuboot-mips.inc
8 8
9KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index b37d789..32351f9 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -3,8 +3,8 @@
3#@DESCRIPTION: Machine configuration for running a MIPS64 system on QEMU 3#@DESCRIPTION: Machine configuration for running a MIPS64 system on QEMU
4 4
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-mips64r2.inc 6require conf/machine/include/mips/tune-mips64r2.inc
7require conf/machine/include/qemuboot-mips.inc 7require conf/machine/include/mips/qemuboot-mips.inc
8 8
9QB_CPU = "-cpu MIPS64R2-generic" 9QB_CPU = "-cpu MIPS64R2-generic"
10 10
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index a84594f..bab06e2 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for running a PPC system on QEMU 3#@DESCRIPTION: Machine configuration for running a PPC system on QEMU
4 4
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-ppc7400.inc 6require conf/machine/include/powerpc/tune-ppc7400.inc
7 7
8TARGET_CC_KERNEL_ARCH = "-mno-spe" 8TARGET_CC_KERNEL_ARCH = "-mno-spe"
9 9
diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf
index a5270e9..2902d54 100644
--- a/meta/conf/machine/qemuppc64.conf
+++ b/meta/conf/machine/qemuppc64.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for running a PPC system on QEMU 3#@DESCRIPTION: Machine configuration for running a PPC system on QEMU
4 4
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-power9.inc 6require conf/machine/include/powerpc/tune-power9.inc
7 7
8KERNEL_IMAGETYPE = "vmlinux" 8KERNEL_IMAGETYPE = "vmlinux"
9 9
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index db9004e..978334d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc 10require conf/machine/include/qemu.inc
11DEFAULTTUNE ?= "core2-64" 11DEFAULTTUNE ?= "core2-64"
12require conf/machine/include/tune-core2.inc 12require conf/machine/include/x86/tune-core2.inc
13require conf/machine/include/qemuboot-x86.inc 13require conf/machine/include/x86/qemuboot-x86.inc
14 14
15UBOOT_MACHINE ?= "qemu-x86_64_defconfig" 15UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
16 16
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 7e6723b..ad7f6e0 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc 10require conf/machine/include/qemu.inc
11DEFAULTTUNE ?= "core2-32" 11DEFAULTTUNE ?= "core2-32"
12require conf/machine/include/tune-corei7.inc 12require conf/machine/include/x86/tune-corei7.inc
13require conf/machine/include/qemuboot-x86.inc 13require conf/machine/include/x86/qemuboot-x86.inc
14 14
15UBOOT_MACHINE ?= "qemu-x86_defconfig" 15UBOOT_MACHINE ?= "qemu-x86_defconfig"
16 16