* [PATCH v2 1/3] conf/machine: move tune files to architecture directories
2021-08-16 22:01 [PATCH v2 0/3] tunes: the great migration Jon Mason
@ 2021-08-16 22:01 ` Jon Mason
2021-08-16 22:01 ` [PATCH v2 2/3] yocto-bsp: update machine confs with new tune locations Jon Mason
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2021-08-16 22:01 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc | 0
meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc | 0
meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc | 0
.../machine/include/{ => arm/armv4}/tune-strongarm1100.inc | 0
meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc | 0
meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc | 0
meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc | 0
.../conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc | 0
.../conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc | 0
.../{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} | 0
.../armv6m/tune-cortexm0plus.inc} | 0
meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc | 0
meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc | 0
meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc | 0
meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc | 0
meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc | 0
.../machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc | 0
.../include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc | 0
.../include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc | 0
.../include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc | 0
meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc | 0
meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc | 0
.../conf/machine/include/{ => microblaze}/tune-microblaze.inc | 0
meta/conf/machine/include/{ => mips}/qemuboot-mips.inc | 0
meta/conf/machine/include/mips/tune-mips-24k.inc | 2 +-
meta/conf/machine/include/mips/tune-mips-74k.inc | 2 +-
meta/conf/machine/include/{ => mips}/tune-mips32.inc | 0
meta/conf/machine/include/{ => mips}/tune-mips32r2.inc | 2 +-
meta/conf/machine/include/{ => mips}/tune-mips32r6.inc | 0
meta/conf/machine/include/mips/tune-mips64.inc | 3 +++
meta/conf/machine/include/{ => mips}/tune-mips64r2.inc | 2 +-
meta/conf/machine/include/{ => mips}/tune-mips64r6.inc | 0
meta/conf/machine/include/{ => mips}/tune-octeon.inc | 2 +-
meta/conf/machine/include/{ => powerpc}/tune-power5.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-power6.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-power7.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-power9.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc | 0
meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc | 0
meta/conf/machine/include/{ => sh}/tune-sh3.inc | 0
meta/conf/machine/include/{ => sh}/tune-sh4.inc | 2 +-
meta/conf/machine/include/tune-mips64.inc | 3 ---
meta/conf/machine/include/{ => x86}/qemuboot-x86.inc | 0
meta/conf/machine/include/{ => x86}/tune-atom.inc | 2 +-
meta/conf/machine/include/{ => x86}/tune-c3.inc | 0
meta/conf/machine/include/{ => x86}/tune-core2.inc | 2 +-
meta/conf/machine/include/{ => x86}/tune-corei7.inc | 2 +-
meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc | 0
meta/conf/machine/include/{ => x86}/tune-i586.inc | 0
meta/conf/machine/include/{ => x86}/tune-i686.inc | 2 +-
meta/conf/machine/include/{ => x86}/x86-base.inc | 0
meta/conf/machine/qemuarm.conf | 2 +-
meta/conf/machine/qemuarm64.conf | 2 +-
meta/conf/machine/qemuarmv5.conf | 2 +-
meta/conf/machine/qemumips.conf | 4 ++--
meta/conf/machine/qemumips64.conf | 4 ++--
meta/conf/machine/qemuppc.conf | 2 +-
meta/conf/machine/qemuppc64.conf | 2 +-
meta/conf/machine/qemux86-64.conf | 4 ++--
meta/conf/machine/qemux86.conf | 4 ++--
78 files changed, 26 insertions(+), 26 deletions(-)
rename meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc (100%)
rename meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc (100%)
rename meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc (100%)
rename meta/conf/machine/include/{ => arm/armv4}/tune-strongarm1100.inc (100%)
rename meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc (100%)
rename meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc (100%)
rename meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc (100%)
rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc (100%)
rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc (100%)
rename meta/conf/machine/include/{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} (100%)
rename meta/conf/machine/include/{tune-cortex-m0plus.inc => arm/armv6m/tune-cortexm0plus.inc} (100%)
rename meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc (100%)
rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc (100%)
rename meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc (100%)
rename meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc (100%)
rename meta/conf/machine/include/{ => microblaze}/tune-microblaze.inc (100%)
rename meta/conf/machine/include/{ => mips}/qemuboot-mips.inc (100%)
rename meta/conf/machine/include/{ => mips}/tune-mips32.inc (100%)
rename meta/conf/machine/include/{ => mips}/tune-mips32r2.inc (95%)
rename meta/conf/machine/include/{ => mips}/tune-mips32r6.inc (100%)
create mode 100644 meta/conf/machine/include/mips/tune-mips64.inc
rename meta/conf/machine/include/{ => mips}/tune-mips64r2.inc (98%)
rename meta/conf/machine/include/{ => mips}/tune-mips64r6.inc (100%)
rename meta/conf/machine/include/{ => mips}/tune-octeon.inc (96%)
rename meta/conf/machine/include/{ => powerpc}/tune-power5.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-power6.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-power7.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-power9.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc (100%)
rename meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc (100%)
rename meta/conf/machine/include/{ => sh}/tune-sh3.inc (100%)
rename meta/conf/machine/include/{ => sh}/tune-sh4.inc (93%)
delete mode 100644 meta/conf/machine/include/tune-mips64.inc
rename meta/conf/machine/include/{ => x86}/qemuboot-x86.inc (100%)
rename meta/conf/machine/include/{ => x86}/tune-atom.inc (50%)
rename meta/conf/machine/include/{ => x86}/tune-c3.inc (100%)
rename meta/conf/machine/include/{ => x86}/tune-core2.inc (97%)
rename meta/conf/machine/include/{ => x86}/tune-corei7.inc (97%)
rename meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc (100%)
rename meta/conf/machine/include/{ => x86}/tune-i586.inc (100%)
rename meta/conf/machine/include/{ => x86}/tune-i686.inc (94%)
rename meta/conf/machine/include/{ => x86}/x86-base.inc (100%)
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/arm/armv4/tune-arm920t.inc
similarity index 100%
rename from meta/conf/machine/include/tune-arm920t.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-arm9tdmi.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ep9312.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-strongarm1100.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-arm926ejs.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-iwmmxt.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-xscale.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-arm1136jf-s.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-arm1176jz-s.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortex-m0.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortex-m0plus.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexm1.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa15.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa17.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa5.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa7.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa8.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa9.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexm3.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexm4.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexm7.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa55.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa32.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa35.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa53.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa57-cortexa53.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa57.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa72-cortexa53.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa72.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-cortexa73-cortexa53.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-thunderx.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-mcf5441x.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-microblaze.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/qemuboot-mips.inc
rename to 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 ed6566587d69..106ff62fbb50 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"
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
diff --git a/meta/conf/machine/include/mips/tune-mips-74k.inc b/meta/conf/machine/include/mips/tune-mips-74k.inc
index 988cfaef6e92..e4927a1ce007 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"
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
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/mips/tune-mips32.inc
similarity index 100%
rename from meta/conf/machine/include/tune-mips32.inc
rename to 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
similarity index 95%
rename from meta/conf/machine/include/tune-mips32r2.inc
rename to meta/conf/machine/include/mips/tune-mips32r2.inc
index e7f6753d3d18..c868e925e90a 100644
--- a/meta/conf/machine/include/tune-mips32r2.inc
+++ b/meta/conf/machine/include/mips/tune-mips32r2.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"
diff --git a/meta/conf/machine/include/tune-mips32r6.inc b/meta/conf/machine/include/mips/tune-mips32r6.inc
similarity index 100%
rename from meta/conf/machine/include/tune-mips32r6.inc
rename to 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 000000000000..a9080159fca7
--- /dev/null
+++ b/meta/conf/machine/include/mips/tune-mips64.inc
@@ -0,0 +1,3 @@
+DEFAULTTUNE ?= "mips64"
+
+require 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
similarity index 98%
rename from meta/conf/machine/include/tune-mips64r2.inc
rename to meta/conf/machine/include/mips/tune-mips64r2.inc
index 6337abb09f1d..c644f409187b 100644
--- a/meta/conf/machine/include/tune-mips64r2.inc
+++ b/meta/conf/machine/include/mips/tune-mips64r2.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)}"
diff --git a/meta/conf/machine/include/tune-mips64r6.inc b/meta/conf/machine/include/mips/tune-mips64r6.inc
similarity index 100%
rename from meta/conf/machine/include/tune-mips64r6.inc
rename to 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
similarity index 96%
rename from meta/conf/machine/include/tune-octeon.inc
rename to meta/conf/machine/include/mips/tune-octeon.inc
index 455c6a2f334e..d4670e3259dd 100644
--- a/meta/conf/machine/include/tune-octeon.inc
+++ b/meta/conf/machine/include/mips/tune-octeon.inc
@@ -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"
diff --git a/meta/conf/machine/include/tune-power5.inc b/meta/conf/machine/include/powerpc/tune-power5.inc
similarity index 100%
rename from meta/conf/machine/include/tune-power5.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-power6.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-power7.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-power9.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppc476.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppc603e.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppc7400.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce300c2.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce300c3.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce500.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce500mc.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce500v2.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce5500.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-ppce6500.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-sh3.inc
rename to 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
similarity index 93%
rename from meta/conf/machine/include/tune-sh4.inc
rename to meta/conf/machine/include/sh/tune-sh4.inc
index e21ede36c4ba..b4893a47486e 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
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"
diff --git a/meta/conf/machine/include/tune-mips64.inc b/meta/conf/machine/include/tune-mips64.inc
deleted file mode 100644
index 9be0e0f8d937..000000000000
--- a/meta/conf/machine/include/tune-mips64.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-DEFAULTTUNE ?= "mips64"
-
-require 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
similarity index 100%
rename from meta/conf/machine/include/qemuboot-x86.inc
rename to 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
similarity index 50%
rename from meta/conf/machine/include/tune-atom.inc
rename to meta/conf/machine/include/x86/tune-atom.inc
index 5e1bb74c6cd2..6b84fffc3ff4 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/x86/tune-atom.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
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/x86/tune-c3.inc
similarity index 100%
rename from meta/conf/machine/include/tune-c3.inc
rename to 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
similarity index 97%
rename from meta/conf/machine/include/tune-core2.inc
rename to meta/conf/machine/include/x86/tune-core2.inc
index a551cad4d567..97b7c1b1889b 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/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"
diff --git a/meta/conf/machine/include/tune-corei7.inc b/meta/conf/machine/include/x86/tune-corei7.inc
similarity index 97%
rename from meta/conf/machine/include/tune-corei7.inc
rename to meta/conf/machine/include/x86/tune-corei7.inc
index bf1ac7a93b33..7798288a74b2 100644
--- a/meta/conf/machine/include/tune-corei7.inc
+++ b/meta/conf/machine/include/x86/tune-corei7.inc
@@ -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"
diff --git a/meta/conf/machine/include/tune-i586-nlp.inc b/meta/conf/machine/include/x86/tune-i586-nlp.inc
similarity index 100%
rename from meta/conf/machine/include/tune-i586-nlp.inc
rename to 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
similarity index 100%
rename from meta/conf/machine/include/tune-i586.inc
rename to 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
similarity index 94%
rename from meta/conf/machine/include/tune-i686.inc
rename to meta/conf/machine/include/x86/tune-i686.inc
index 3feb4df8ba2f..293d81e6c540 100644
--- a/meta/conf/machine/include/tune-i686.inc
+++ b/meta/conf/machine/include/x86/tune-i686.inc
@@ -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"
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
similarity index 100%
rename from meta/conf/machine/include/x86-base.inc
rename to meta/conf/machine/include/x86/x86-base.inc
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index f893f1a76a0e..93d855b6e1e2 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -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"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 3dcb0d1b1ef1..ea7fae2722a0 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -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"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 7650c2f4a2c2..277dd08ed78d 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -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"
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 9b602fcd1f36..1cf21b92fe6a 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -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"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index b37d78989b26..32351f993e92 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -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"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index a84594f335f3..bab06e292e58 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -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"
diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf
index a5270e98edb7..2902d541ad6e 100644
--- a/meta/conf/machine/qemuppc64.conf
+++ b/meta/conf/machine/qemuppc64.conf
@@ -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"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index db9004ee3278..978334d5bbad 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -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"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 7e6723b880a2..ad7f6e0ee482 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -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"
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/3] yocto-bsp: update machine confs with new tune locations
2021-08-16 22:01 [PATCH v2 0/3] tunes: the great migration Jon Mason
2021-08-16 22:01 ` [PATCH v2 1/3] conf/machine: move tune files to architecture directories Jon Mason
@ 2021-08-16 22:01 ` Jon Mason
2021-08-16 22:01 ` [PATCH v2 3/3] docs: update docs " Jon Mason
2021-08-17 20:44 ` [OE-core] [PATCH v2 0/3] tunes: the great migration Alexandre Belloni
3 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2021-08-16 22:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +-
meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +-
meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 +-
meta-yocto-bsp/conf/machine/genericx86.conf | 2 +-
meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 65c79fd34db6..fa7275fe2d26 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -12,7 +12,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
DEFAULTTUNE ?= "cortexa8hf-neon"
-include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/arm/armv7a/tune-cortexa8.inc
IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
EXTRA_IMAGECMD:jffs2 = "-lnp "
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf
index fbe33be9d157..447862f550bc 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -2,7 +2,7 @@
#@NAME: Edgerouter
#@DESCRIPTION: Machine configuration for a generic edgerouter
-require conf/machine/include/tune-mips64.inc
+require conf/machine/include/mips/tune-mips64.inc
MACHINE_FEATURES = "pci ext2 ext3 serial"
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf
index 81ec24e97146..14913ea1f152 100644
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
DEFAULTTUNE ?= "core2-64"
-require conf/machine/include/tune-core2.inc
+require conf/machine/include/x86/tune-core2.inc
require conf/machine/include/genericx86-common.inc
SERIAL_CONSOLES_CHECK = "ttyS0"
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 1387bde852f8..ed4fc8a3de8d 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
DEFAULTTUNE ?= "core2-32"
-require conf/machine/include/tune-core2.inc
+require conf/machine/include/x86/tune-core2.inc
require conf/machine/include/genericx86-common.inc
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 59d96d1417b0..253a855dc344 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -1,5 +1,5 @@
-include conf/machine/include/x86-base.inc
-require conf/machine/include/qemuboot-x86.inc
+include conf/machine/include/x86/x86-base.inc
+require conf/machine/include/x86/qemuboot-x86.inc
MACHINE_FEATURES += "wifi efi pcbios"
PREFERRED_VERSION_linux-yocto ?= "5.10%"
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] docs: update docs with new tune locations
2021-08-16 22:01 [PATCH v2 0/3] tunes: the great migration Jon Mason
2021-08-16 22:01 ` [PATCH v2 1/3] conf/machine: move tune files to architecture directories Jon Mason
2021-08-16 22:01 ` [PATCH v2 2/3] yocto-bsp: update machine confs with new tune locations Jon Mason
@ 2021-08-16 22:01 ` Jon Mason
2021-08-17 20:44 ` [OE-core] [PATCH v2 0/3] tunes: the great migration Alexandre Belloni
3 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2021-08-16 22:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
documentation/bsp-guide/bsp.rst | 4 ++--
documentation/dev-manual/common-tasks.rst | 2 +-
documentation/ref-manual/variables.rst | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst
index b80354a05bb6..37b052427e62 100644
--- a/documentation/bsp-guide/bsp.rst
+++ b/documentation/bsp-guide/bsp.rst
@@ -1266,7 +1266,7 @@ located in the layer ``poky/meta-yocto-bsp/conf/machine`` and is named
EXTRA_IMAGEDEPENDS += "u-boot"
DEFAULTTUNE ?= "cortexa8hf-neon"
- include conf/machine/include/tune-cortexa8.inc
+ include conf/machine/include/arm/armv7a/tune-cortexa8.inc
IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
EXTRA_IMAGECMD:jffs2 = "-lnp "
@@ -1344,7 +1344,7 @@ Project Reference Manual.
.. note::
The include statement that pulls in the
- ``conf/machine/include/tune-cortexa8.inc`` file provides many tuning
+ ``conf/machine/include/arm/tune-cortexa8.inc`` file provides many tuning
possibilities.
- :term:`IMAGE_FSTYPES`: The
diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst
index 7f51674a92a3..4a5011ea749a 100644
--- a/documentation/dev-manual/common-tasks.rst
+++ b/documentation/dev-manual/common-tasks.rst
@@ -2064,7 +2064,7 @@ Now comes the time to actually build an image and you need a kernel
recipe, but which one? You can configure your build to call out the
kernel recipe you want by using the :term:`PREFERRED_PROVIDER` variable. As
an example, consider the :yocto_git:`x86-base.inc
-</poky/tree/meta/conf/machine/include/x86-base.inc>` include file, which is a
+</poky/tree/meta/conf/machine/include/x86/x86-base.inc>` include file, which is a
machine (i.e. :term:`MACHINE`) configuration file. This include file is the
reason all x86-based machines use the ``linux-yocto`` kernel. Here are the
relevant lines from the include file::
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 7aecda017454..d5ac1926b6ee 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -8256,7 +8256,7 @@ system and gives an overview of their function and contents.
These tune-specific package architectures are defined in the machine
include files. Here is an example of the "core2-32" tuning as used in
- the ``meta/conf/machine/include/tune-core2.inc`` file::
+ the ``meta/conf/machine/include/x86/tune-core2.inc`` file::
TUNE_PKGARCH:tune-core2-32 = "core2-32"
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH v2 0/3] tunes: the great migration
2021-08-16 22:01 [PATCH v2 0/3] tunes: the great migration Jon Mason
` (2 preceding siblings ...)
2021-08-16 22:01 ` [PATCH v2 3/3] docs: update docs " Jon Mason
@ 2021-08-17 20:44 ` Alexandre Belloni
2021-08-18 0:58 ` Jon Mason
3 siblings, 1 reply; 6+ messages in thread
From: Alexandre Belloni @ 2021-08-17 20:44 UTC (permalink / raw)
To: Jon Mason, Anuj Mittal; +Cc: openembedded-core
Hello Jon,
I did run that through the autobuilders:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2457
This is mostly good, the meta-arm failure is about a kernel patch not
applying, I don't think it is related, you'd have to rebase
meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.10/n1sdp/0005-r8169-Fix-to-avoid-duplicate-sysfs-entry-creation-er.patch
Anuj, the remaining failure is in meta-intel:
ERROR: ParseError at /home/pokybuild/yocto-worker/meta-intel/build/meta-intel/conf/machine/include/intel-corei7-64-common.inc:6: Could not include required file conf/machine/include/tune-corei7.inc
Can you take care of fixing that?
I you want to test, my branch is here:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=abelloni/testing
On 16/08/2021 18:01:41-0400, Jon Mason wrote:
> New in v2
> * Fix relocation oversight issue found by Alexandre Belloni
> * More aggressive sorting of Arm, putting each tune into it's respective
> design versioned family
>
> I ran a quick and dirty CI on this via gitlab, though now including
> machines for all present in meta-yocto-bsp. The results can be found
> at https://gitlab.com/jonmason00/poky/-/pipelines/353961908
> NOTE: CI is also including patches from upcoming series to support
> Cortex-R. So, it's not 100% pristine.
>
> ---
>
> Move all tune files into their architecture directory.
>
> I'm doing this all as one series, even though they are going to
> different repos, as an attempt to make this as atomic as possible.
>
>
> Jon Mason (3):
> conf/machine: move tune files to architecture directories
> yocto-bsp: update machine confs with new tune locations
> docs: update docs with new tune locations
>
> documentation/bsp-guide/bsp.rst | 4 ++--
> documentation/dev-manual/common-tasks.rst | 2 +-
> documentation/ref-manual/variables.rst | 2 +-
> meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +-
> meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +-
> meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 +-
> meta-yocto-bsp/conf/machine/genericx86.conf | 2 +-
> meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ++--
> meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc | 0
> meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc | 0
> meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc | 0
> .../machine/include/{ => arm/armv4}/tune-strongarm1100.inc | 0
> meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc | 0
> meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc | 0
> meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc | 0
> .../conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc | 0
> .../conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc | 0
> .../{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} | 0
> .../armv6m/tune-cortexm0plus.inc} | 0
> meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc | 0
> meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc | 0
> meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc | 0
> meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc | 0
> meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc | 0
> .../machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc | 0
> .../include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc | 0
> .../include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc | 0
> .../include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc | 0
> meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc | 0
> meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc | 0
> .../conf/machine/include/{ => microblaze}/tune-microblaze.inc | 0
> meta/conf/machine/include/{ => mips}/qemuboot-mips.inc | 0
> meta/conf/machine/include/mips/tune-mips-24k.inc | 2 +-
> meta/conf/machine/include/mips/tune-mips-74k.inc | 2 +-
> meta/conf/machine/include/{ => mips}/tune-mips32.inc | 0
> meta/conf/machine/include/{ => mips}/tune-mips32r2.inc | 2 +-
> meta/conf/machine/include/{ => mips}/tune-mips32r6.inc | 0
> meta/conf/machine/include/mips/tune-mips64.inc | 3 +++
> meta/conf/machine/include/{ => mips}/tune-mips64r2.inc | 2 +-
> meta/conf/machine/include/{ => mips}/tune-mips64r6.inc | 0
> meta/conf/machine/include/{ => mips}/tune-octeon.inc | 2 +-
> meta/conf/machine/include/{ => powerpc}/tune-power5.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-power6.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-power7.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-power9.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc | 0
> meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc | 0
> meta/conf/machine/include/{ => sh}/tune-sh3.inc | 0
> meta/conf/machine/include/{ => sh}/tune-sh4.inc | 2 +-
> meta/conf/machine/include/tune-mips64.inc | 3 ---
> meta/conf/machine/include/{ => x86}/qemuboot-x86.inc | 0
> meta/conf/machine/include/{ => x86}/tune-atom.inc | 2 +-
> meta/conf/machine/include/{ => x86}/tune-c3.inc | 0
> meta/conf/machine/include/{ => x86}/tune-core2.inc | 2 +-
> meta/conf/machine/include/{ => x86}/tune-corei7.inc | 2 +-
> meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc | 0
> meta/conf/machine/include/{ => x86}/tune-i586.inc | 0
> meta/conf/machine/include/{ => x86}/tune-i686.inc | 2 +-
> meta/conf/machine/include/{ => x86}/x86-base.inc | 0
> meta/conf/machine/qemuarm.conf | 2 +-
> meta/conf/machine/qemuarm64.conf | 2 +-
> meta/conf/machine/qemuarmv5.conf | 2 +-
> meta/conf/machine/qemumips.conf | 4 ++--
> meta/conf/machine/qemumips64.conf | 4 ++--
> meta/conf/machine/qemuppc.conf | 2 +-
> meta/conf/machine/qemuppc64.conf | 2 +-
> meta/conf/machine/qemux86-64.conf | 4 ++--
> meta/conf/machine/qemux86.conf | 4 ++--
> 86 files changed, 36 insertions(+), 36 deletions(-)
> rename meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv4}/tune-strongarm1100.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc (100%)
> rename meta/conf/machine/include/{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} (100%)
> rename meta/conf/machine/include/{tune-cortex-m0plus.inc => arm/armv6m/tune-cortexm0plus.inc} (100%)
> rename meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc (100%)
> rename meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc (100%)
> rename meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc (100%)
> rename meta/conf/machine/include/{ => microblaze}/tune-microblaze.inc (100%)
> rename meta/conf/machine/include/{ => mips}/qemuboot-mips.inc (100%)
> rename meta/conf/machine/include/{ => mips}/tune-mips32.inc (100%)
> rename meta/conf/machine/include/{ => mips}/tune-mips32r2.inc (95%)
> rename meta/conf/machine/include/{ => mips}/tune-mips32r6.inc (100%)
> create mode 100644 meta/conf/machine/include/mips/tune-mips64.inc
> rename meta/conf/machine/include/{ => mips}/tune-mips64r2.inc (98%)
> rename meta/conf/machine/include/{ => mips}/tune-mips64r6.inc (100%)
> rename meta/conf/machine/include/{ => mips}/tune-octeon.inc (96%)
> rename meta/conf/machine/include/{ => powerpc}/tune-power5.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-power6.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-power7.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-power9.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc (100%)
> rename meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc (100%)
> rename meta/conf/machine/include/{ => sh}/tune-sh3.inc (100%)
> rename meta/conf/machine/include/{ => sh}/tune-sh4.inc (93%)
> delete mode 100644 meta/conf/machine/include/tune-mips64.inc
> rename meta/conf/machine/include/{ => x86}/qemuboot-x86.inc (100%)
> rename meta/conf/machine/include/{ => x86}/tune-atom.inc (50%)
> rename meta/conf/machine/include/{ => x86}/tune-c3.inc (100%)
> rename meta/conf/machine/include/{ => x86}/tune-core2.inc (97%)
> rename meta/conf/machine/include/{ => x86}/tune-corei7.inc (97%)
> rename meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc (100%)
> rename meta/conf/machine/include/{ => x86}/tune-i586.inc (100%)
> rename meta/conf/machine/include/{ => x86}/tune-i686.inc (94%)
> rename meta/conf/machine/include/{ => x86}/x86-base.inc (100%)
>
> --
> 2.20.1
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH v2 0/3] tunes: the great migration
2021-08-17 20:44 ` [OE-core] [PATCH v2 0/3] tunes: the great migration Alexandre Belloni
@ 2021-08-18 0:58 ` Jon Mason
0 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2021-08-18 0:58 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Anuj Mittal, Patches and discussions about the oe-core layer
On Tue, Aug 17, 2021 at 4:44 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello Jon,
>
> I did run that through the autobuilders:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2457
>
> This is mostly good, the meta-arm failure is about a kernel patch not
> applying, I don't think it is related, you'd have to rebase
> meta-arm-bsp/recipes-kernel/linux/linux-yocto-5.10/n1sdp/0005-r8169-Fix-to-avoid-duplicate-sysfs-entry-creation-er.patch
Yes, this is fallout from the kernel updating behind us. That patch
was upstreamed and is now unnecessary. I have a patch queued to
address it.
Thanks for all the testing. This was quite an invasive change and it needed it.
Thanks,
Jon
>
> Anuj, the remaining failure is in meta-intel:
> ERROR: ParseError at /home/pokybuild/yocto-worker/meta-intel/build/meta-intel/conf/machine/include/intel-corei7-64-common.inc:6: Could not include required file conf/machine/include/tune-corei7.inc
>
> Can you take care of fixing that?
>
> I you want to test, my branch is here:
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=abelloni/testing
>
>
>
> On 16/08/2021 18:01:41-0400, Jon Mason wrote:
> > New in v2
> > * Fix relocation oversight issue found by Alexandre Belloni
> > * More aggressive sorting of Arm, putting each tune into it's respective
> > design versioned family
> >
> > I ran a quick and dirty CI on this via gitlab, though now including
> > machines for all present in meta-yocto-bsp. The results can be found
> > at https://gitlab.com/jonmason00/poky/-/pipelines/353961908
> > NOTE: CI is also including patches from upcoming series to support
> > Cortex-R. So, it's not 100% pristine.
> >
> > ---
> >
> > Move all tune files into their architecture directory.
> >
> > I'm doing this all as one series, even though they are going to
> > different repos, as an attempt to make this as atomic as possible.
> >
> >
> > Jon Mason (3):
> > conf/machine: move tune files to architecture directories
> > yocto-bsp: update machine confs with new tune locations
> > docs: update docs with new tune locations
> >
> > documentation/bsp-guide/bsp.rst | 4 ++--
> > documentation/dev-manual/common-tasks.rst | 2 +-
> > documentation/ref-manual/variables.rst | 2 +-
> > meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +-
> > meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +-
> > meta-yocto-bsp/conf/machine/genericx86-64.conf | 2 +-
> > meta-yocto-bsp/conf/machine/genericx86.conf | 2 +-
> > meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ++--
> > meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc | 0
> > meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc | 0
> > meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc | 0
> > .../machine/include/{ => arm/armv4}/tune-strongarm1100.inc | 0
> > meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc | 0
> > meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc | 0
> > meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc | 0
> > .../conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc | 0
> > .../conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc | 0
> > .../{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} | 0
> > .../armv6m/tune-cortexm0plus.inc} | 0
> > meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc | 0
> > meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc | 0
> > meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc | 0
> > meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc | 0
> > meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc | 0
> > .../machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc | 0
> > .../include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc | 0
> > .../include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc | 0
> > .../include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc | 0
> > meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc | 0
> > meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc | 0
> > .../conf/machine/include/{ => microblaze}/tune-microblaze.inc | 0
> > meta/conf/machine/include/{ => mips}/qemuboot-mips.inc | 0
> > meta/conf/machine/include/mips/tune-mips-24k.inc | 2 +-
> > meta/conf/machine/include/mips/tune-mips-74k.inc | 2 +-
> > meta/conf/machine/include/{ => mips}/tune-mips32.inc | 0
> > meta/conf/machine/include/{ => mips}/tune-mips32r2.inc | 2 +-
> > meta/conf/machine/include/{ => mips}/tune-mips32r6.inc | 0
> > meta/conf/machine/include/mips/tune-mips64.inc | 3 +++
> > meta/conf/machine/include/{ => mips}/tune-mips64r2.inc | 2 +-
> > meta/conf/machine/include/{ => mips}/tune-mips64r6.inc | 0
> > meta/conf/machine/include/{ => mips}/tune-octeon.inc | 2 +-
> > meta/conf/machine/include/{ => powerpc}/tune-power5.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-power6.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-power7.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-power9.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc | 0
> > meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc | 0
> > meta/conf/machine/include/{ => sh}/tune-sh3.inc | 0
> > meta/conf/machine/include/{ => sh}/tune-sh4.inc | 2 +-
> > meta/conf/machine/include/tune-mips64.inc | 3 ---
> > meta/conf/machine/include/{ => x86}/qemuboot-x86.inc | 0
> > meta/conf/machine/include/{ => x86}/tune-atom.inc | 2 +-
> > meta/conf/machine/include/{ => x86}/tune-c3.inc | 0
> > meta/conf/machine/include/{ => x86}/tune-core2.inc | 2 +-
> > meta/conf/machine/include/{ => x86}/tune-corei7.inc | 2 +-
> > meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc | 0
> > meta/conf/machine/include/{ => x86}/tune-i586.inc | 0
> > meta/conf/machine/include/{ => x86}/tune-i686.inc | 2 +-
> > meta/conf/machine/include/{ => x86}/x86-base.inc | 0
> > meta/conf/machine/qemuarm.conf | 2 +-
> > meta/conf/machine/qemuarm64.conf | 2 +-
> > meta/conf/machine/qemuarmv5.conf | 2 +-
> > meta/conf/machine/qemumips.conf | 4 ++--
> > meta/conf/machine/qemumips64.conf | 4 ++--
> > meta/conf/machine/qemuppc.conf | 2 +-
> > meta/conf/machine/qemuppc64.conf | 2 +-
> > meta/conf/machine/qemux86-64.conf | 4 ++--
> > meta/conf/machine/qemux86.conf | 4 ++--
> > 86 files changed, 36 insertions(+), 36 deletions(-)
> > rename meta/conf/machine/include/{ => arm/armv4}/tune-arm920t.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv4}/tune-arm9tdmi.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv4}/tune-ep9312.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv4}/tune-strongarm1100.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv5}/tune-arm926ejs.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv5}/tune-iwmmxt.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv5}/tune-xscale.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1136jf-s.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv6}/tune-arm1176jz-s.inc (100%)
> > rename meta/conf/machine/include/{tune-cortex-m0.inc => arm/armv6m/tune-cortexm0.inc} (100%)
> > rename meta/conf/machine/include/{tune-cortex-m0plus.inc => arm/armv6m/tune-cortexm0plus.inc} (100%)
> > rename meta/conf/machine/include/{ => arm/armv6m}/tune-cortexm1.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa15.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa17.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa5.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa7.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa8.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7a}/tune-cortexa9.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm3.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm4.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv7m}/tune-cortexm7.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8-2a}/tune-cortexa55.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa32.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa35.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa53.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57-cortexa53.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa57.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72-cortexa53.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa72.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-cortexa73-cortexa53.inc (100%)
> > rename meta/conf/machine/include/{ => arm/armv8a}/tune-thunderx.inc (100%)
> > rename meta/conf/machine/include/{ => m68k}/tune-mcf5441x.inc (100%)
> > rename meta/conf/machine/include/{ => microblaze}/tune-microblaze.inc (100%)
> > rename meta/conf/machine/include/{ => mips}/qemuboot-mips.inc (100%)
> > rename meta/conf/machine/include/{ => mips}/tune-mips32.inc (100%)
> > rename meta/conf/machine/include/{ => mips}/tune-mips32r2.inc (95%)
> > rename meta/conf/machine/include/{ => mips}/tune-mips32r6.inc (100%)
> > create mode 100644 meta/conf/machine/include/mips/tune-mips64.inc
> > rename meta/conf/machine/include/{ => mips}/tune-mips64r2.inc (98%)
> > rename meta/conf/machine/include/{ => mips}/tune-mips64r6.inc (100%)
> > rename meta/conf/machine/include/{ => mips}/tune-octeon.inc (96%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-power5.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-power6.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-power7.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-power9.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppc476.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppc603e.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppc7400.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c2.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce300c3.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce500.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce500mc.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce500v2.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce5500.inc (100%)
> > rename meta/conf/machine/include/{ => powerpc}/tune-ppce6500.inc (100%)
> > rename meta/conf/machine/include/{ => sh}/tune-sh3.inc (100%)
> > rename meta/conf/machine/include/{ => sh}/tune-sh4.inc (93%)
> > delete mode 100644 meta/conf/machine/include/tune-mips64.inc
> > rename meta/conf/machine/include/{ => x86}/qemuboot-x86.inc (100%)
> > rename meta/conf/machine/include/{ => x86}/tune-atom.inc (50%)
> > rename meta/conf/machine/include/{ => x86}/tune-c3.inc (100%)
> > rename meta/conf/machine/include/{ => x86}/tune-core2.inc (97%)
> > rename meta/conf/machine/include/{ => x86}/tune-corei7.inc (97%)
> > rename meta/conf/machine/include/{ => x86}/tune-i586-nlp.inc (100%)
> > rename meta/conf/machine/include/{ => x86}/tune-i586.inc (100%)
> > rename meta/conf/machine/include/{ => x86}/tune-i686.inc (94%)
> > rename meta/conf/machine/include/{ => x86}/x86-base.inc (100%)
> >
> > --
> > 2.20.1
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread