summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-10-28 07:16:22 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2020-10-28 15:25:33 +0100
commitc87f58e4235fc5c2fe31037917fd999bf4142dca (patch)
treeca1ba5dea664ae399ff018f4399db3f72e648875
parent93e725b2e1b4da6b246806bf448cd928b7f4892b (diff)
downloadopenembedded-core-contrib-c87f58e4235fc5c2fe31037917fd999bf4142dca.tar.gz
tune/test.sh: results (oe-core/dunfell: 197b405dd0 siteinfo: Recognize bigendian sh3be and sh4be)
* this run was without: PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" so thumb was disabled even in the DEFAULTTUNEs which support it Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv4t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5te6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6t-novfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6thf6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6thfb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.arm1176jzs6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv4t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5te6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6t-novfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6thf6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6thfb6
-rw-r--r--scripts/tune/env.fake-arm920t6
-rw-r--r--scripts/tune/env.fake-arm920t.arm920t6
-rw-r--r--scripts/tune/env.fake-arm920t.armv4t6
-rw-r--r--scripts/tune/env.fake-arm920t.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs6
-rw-r--r--scripts/tune/env.fake-arm926ejs.arm926ejs6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv4t6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5t6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5te6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm9tdmi6
-rw-r--r--scripts/tune/env.fake-arm9tdmi.arm9tdmi5
-rw-r--r--scripts/tune/env.fake-arm9tdmi.armv4t6
-rw-r--r--scripts/tune/env.fake-arm9tdmi.armv4tb6
-rw-r--r--scripts/tune/env.fake-cortex-m08
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv47
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv4b7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv4t7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv57
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5b7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5t7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0.armv6m7
-rw-r--r--scripts/tune/env.fake-cortex-m0.cortexm07
-rw-r--r--scripts/tune/env.fake-cortex-m0plus8
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv47
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv4b7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv4t7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv57
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5b7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5t7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.armv6m7
-rw-r--r--scripts/tune/env.fake-cortex-m0plus.cortexm0-plus7
-rw-r--r--scripts/tune/env.fake-cortexa32.armv8a2
-rw-r--r--scripts/tune/env.fake-cortexa32.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-cortexa32.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa32.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa348
-rw-r--r--scripts/tune/env.fake-cortexa34.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa34.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv57
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv67
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa34.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa34.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa34.cortexa347
-rw-r--r--scripts/tune/env.fake-cortexa34.cortexa34-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa358
-rw-r--r--scripts/tune/env.fake-cortexa35.armv8a2
-rw-r--r--scripts/tune/env.fake-cortexa35.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-cortexa35.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa35.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa35.cortexa358
-rw-r--r--scripts/tune/env.fake-cortexa35.cortexa35-crypto8
-rw-r--r--scripts/tune/env.fake-cortexa538
-rw-r--r--scripts/tune/env.fake-cortexa53.armv8a2
-rw-r--r--scripts/tune/env.fake-cortexa53.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-cortexa53.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa53.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa53.cortexa538
-rw-r--r--scripts/tune/env.fake-cortexa53.cortexa53-crypto8
-rw-r--r--scripts/tune/env.fake-cortexa558
-rw-r--r--scripts/tune/env.fake-cortexa55.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa55.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv57
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv67
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa55.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa55.cortexa557
-rw-r--r--scripts/tune/env.fake-cortexa578
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa5310
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.aarch644
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be4
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.armv8a6
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc6
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto6
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto6
-rw-r--r--scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa5310
-rw-r--r--scripts/tune/env.fake-cortexa57.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa57.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv57
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv67
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa57.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa57.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa57.cortexa577
-rw-r--r--scripts/tune/env.fake-cortexa57.cortexa57-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa658
-rw-r--r--scripts/tune/env.fake-cortexa65.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa65.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv57
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv67
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65.cortexa657
-rw-r--r--scripts/tune/env.fake-cortexa65ae8
-rw-r--r--scripts/tune/env.fake-cortexa65ae.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa65ae.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv57
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv67
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa65ae.cortexa65ae7
-rw-r--r--scripts/tune/env.fake-cortexa728
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa536
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.armv8a2
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa536
-rw-r--r--scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto8
-rw-r--r--scripts/tune/env.fake-cortexa72.armv8a2
-rw-r--r--scripts/tune/env.fake-cortexa72.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-cortexa72.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa72.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-cortexa72.cortexa728
-rw-r--r--scripts/tune/env.fake-cortexa738
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa358
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv57
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv67
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa357
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa538
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv57
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv67
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa537
-rw-r--r--scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa73.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv57
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv67
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa73.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa73.cortexa737
-rw-r--r--scripts/tune/env.fake-cortexa758
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa558
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv57
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv67
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa557
-rw-r--r--scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa75.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv57
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv67
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa75.cortexa757
-rw-r--r--scripts/tune/env.fake-cortexa768
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa558
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv57
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv67
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa557
-rw-r--r--scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa76.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv57
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv67
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76.cortexa767
-rw-r--r--scripts/tune/env.fake-cortexa76ae8
-rw-r--r--scripts/tune/env.fake-cortexa76ae.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa76ae.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv57
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv67
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa76ae.cortexa76ae7
-rw-r--r--scripts/tune/env.fake-cortexa778
-rw-r--r--scripts/tune/env.fake-cortexa77.aarch647
-rw-r--r--scripts/tune/env.fake-cortexa77.aarch64_be7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv4b7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv4t7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv4tb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv57
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5b7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5e7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5eb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5t7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5tb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5te7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5teb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv67
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6b7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6hf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6hfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6t7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6tb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6thf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv6thfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8-2a7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8a7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa77.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-cortexa77.cortexa777
-rw-r--r--scripts/tune/env.fake-ep9312.armv4t6
-rw-r--r--scripts/tune/env.fake-ep9312.armv4tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv4t6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv4tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5t6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5te6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5teb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-neoversee18
-rw-r--r--scripts/tune/env.fake-neoversee1.aarch647
-rw-r--r--scripts/tune/env.fake-neoversee1.aarch64_be7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv4b7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv4t7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv4tb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv57
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5b7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5e7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5eb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5t7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5tb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5te7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5teb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv67
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6b7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6hf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6hfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6t7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6tb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6thf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv6thfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8-2a7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8a7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-neoversee1.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-neoversee1.neoversee17
-rw-r--r--scripts/tune/env.fake-neoversen18
-rw-r--r--scripts/tune/env.fake-neoversen1.aarch647
-rw-r--r--scripts/tune/env.fake-neoversen1.aarch64_be7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv4b7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv4t7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv4tb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv57
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5b7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5b-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5e7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5e-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5eb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5eb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5ehf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5ehfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5hf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5hfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5t7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5t-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5tb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5tb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5te7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5te-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5teb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5teb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5tehf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5tehfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5thf-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv5thfb-vfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv67
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6-novfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6b7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6b-novfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6hf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6hfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6t7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6t-novfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6tb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6tb-novfp7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6thf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv6thfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7a-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ab-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7at-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7atb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7athfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7ve-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7veb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vet-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vetb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethf-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb-neon7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb-neon-vfpv47
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv37
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv4d167
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8-2a7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8-2a-crypto7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8a7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8a-crc7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8a-crc-crypto7
-rw-r--r--scripts/tune/env.fake-neoversen1.armv8a-crypto7
-rw-r--r--scripts/tune/env.fake-neoversen1.neoversen17
-rw-r--r--scripts/tune/env.fake-strongarm1100.armv4t6
-rw-r--r--scripts/tune/env.fake-strongarm1100.armv4tb6
-rw-r--r--scripts/tune/env.fake-thunderx2
-rw-r--r--scripts/tune/env.fake-thunderx.armv8a2
-rw-r--r--scripts/tune/env.fake-thunderx.armv8a-crc2
-rw-r--r--scripts/tune/env.fake-thunderx.armv8a-crc-crypto2
-rw-r--r--scripts/tune/env.fake-thunderx.armv8a-crypto2
-rw-r--r--scripts/tune/env.fake-thunderx.thunderx2
-rw-r--r--scripts/tune/env.fake-thunderx.thunderx_be2
-rw-r--r--scripts/tune/env.fake-xscale6
-rw-r--r--scripts/tune/env.fake-xscale.armv4t6
-rw-r--r--scripts/tune/env.fake-xscale.armv4tb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5t6
-rw-r--r--scripts/tune/env.fake-xscale.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5te6
-rw-r--r--scripts/tune/env.fake-xscale.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5teb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.xscale6
-rw-r--r--scripts/tune/env.fake-xscale.xscale-be6
-rw-r--r--scripts/tune/log.fake-arm9tdmi.arm9tdmi8
-rw-r--r--scripts/tune/log.fake-supersparc10
2520 files changed, 416 insertions, 17011 deletions
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv4t b/scripts/tune/env.fake-arm1136jf-s.armv4t
index 38fc2ec264..5192e270c8 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv4t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv4tb b/scripts/tune/env.fake-arm1136jf-s.armv4tb
index 4f55fca2eb..d5af1feb80 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv4tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5t b/scripts/tune/env.fake-arm1136jf-s.armv5t
index 85886cf929..de8ab34eb1 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
index 120636b9e7..000c49d240 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tb b/scripts/tune/env.fake-arm1136jf-s.armv5tb
index 397e450028..01b0bd215d 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
index 94e75891a6..8aa197228f 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5te b/scripts/tune/env.fake-arm1136jf-s.armv5te
index 2e067bf94d..1e26252d81 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5te
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
index 90a36e06d5..dfa17bc727 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5teb b/scripts/tune/env.fake-arm1136jf-s.armv5teb
index 5b222a7547..c0a841313e 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5teb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
index 61daa16a3e..e4801c5e0c 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
index ae4f023073..a335095896 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
index d9714862be..3260df690a 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
index 76ff7343c8..6768edd45c 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
index f579b6fa2d..0aff3ffffc 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6t b/scripts/tune/env.fake-arm1136jf-s.armv6t
index 088aeb12e0..78697687ae 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp b/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
index b702a26609..b5b7fba142 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb"
+TUNE_CCARGS=" -march=armv6 -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6tb b/scripts/tune/env.fake-arm1136jf-s.armv6tb
index 196abd67ea..b592471f7b 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp b/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
index b27c1414b5..e2a82c8216 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb"
+TUNE_CCARGS=" -march=armv6 -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6thf b/scripts/tune/env.fake-arm1136jf-s.armv6thf
index 8ede1f1d2d..b2536cf499 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6thf
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6thf
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6thfb b/scripts/tune/env.fake-arm1136jf-s.armv6thfb
index effc37f4ae..ca263097c7 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6thfb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6thfb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s b/scripts/tune/env.fake-arm1176jz-s
index 25a922209f..c9110c6bea 100644
--- a/scripts/tune/env.fake-arm1176jz-s
+++ b/scripts/tune/env.fake-arm1176jz-s
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb arm1176jzs arm1176jzs-be"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t arm1176jzs arm1176jzst fake_arm1176jz_s"
-TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs"
-TUNE_PKGARCH="arm1176jzst"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzs"
+export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
index d566a8f05b..cfc87abdc8 100644
--- a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
+++ b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t arm1176jzs arm1176jzst fake_arm1176jz_s"
-TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs"
-TUNE_PKGARCH="arm1176jzst"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzs"
+export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
index b3f0ef0df0..4e0597bd5d 100644
--- a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
+++ b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb arm1176jzsb arm1176jzstb fake_arm1176jz_s"
-TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs bigendian"
-TUNE_PKGARCH="arm1176jzstb"
-export CC="armeb-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzsb"
+export CC="armeb-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv4t b/scripts/tune/env.fake-arm1176jz-s.armv4t
index f6ac8e9296..b8a97b81a2 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv4t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv4tb b/scripts/tune/env.fake-arm1176jz-s.armv4tb
index dee74cb30a..c95cbf3eeb 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv4tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5t b/scripts/tune/env.fake-arm1176jz-s.armv5t
index f279424d11..186482916e 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
index 523c305224..177dd12e6b 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tb b/scripts/tune/env.fake-arm1176jz-s.armv5tb
index 239af7f0b7..7f2dda8dbc 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
index 5e16545865..adfe4793f2 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5te b/scripts/tune/env.fake-arm1176jz-s.armv5te
index 84ae5787ae..bcbdd01411 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5te
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
index b4cf40efa4..1e855828a8 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5teb b/scripts/tune/env.fake-arm1176jz-s.armv5teb
index 7e93c20b64..2012821f83 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5teb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
index 591a2f2b05..0c7907f42d 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
index 327206eacd..7e8a434bea 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
index b1cb73cafc..f54b3ccd82 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
index f66184d630..80062e172f 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
index 5a353ecdae..4a1dcbc36c 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6t b/scripts/tune/env.fake-arm1176jz-s.armv6t
index d1663b9b65..87ca718926 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp b/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
index e75b3f45ce..d36333126d 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb"
+TUNE_CCARGS=" -march=armv6 -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6tb b/scripts/tune/env.fake-arm1176jz-s.armv6tb
index 333a284014..8bcf4c1969 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp b/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
index b058f5757f..1dc11ddf88 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb"
+TUNE_CCARGS=" -march=armv6 -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6thf b/scripts/tune/env.fake-arm1176jz-s.armv6thf
index 08a91d7f51..cc11a47f2f 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6thf
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6thf
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6thfb b/scripts/tune/env.fake-arm1176jz-s.armv6thfb
index 9685a08b6e..607be4d96d 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6thfb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6thfb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t b/scripts/tune/env.fake-arm920t
index 69ee23f8e6..684aaff57d 100644
--- a/scripts/tune/env.fake-arm920t
+++ b/scripts/tune/env.fake-arm920t
@@ -1,6 +1,6 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb arm920t"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.arm920t b/scripts/tune/env.fake-arm920t.arm920t
index 1233bdc87b..c7dd31a255 100644
--- a/scripts/tune/env.fake-arm920t.arm920t
+++ b/scripts/tune/env.fake-arm920t.arm920t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm920t arm920tt fake_arm920t"
-TUNE_CCARGS=" -mthumb -mcpu=arm920t"
+TUNE_CCARGS=" -marm -mcpu=arm920t"
TUNE_FEATURES="arm thumb arm920t"
-TUNE_PKGARCH="arm920tt"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm920t --sysroot=SYSROOT"
+TUNE_PKGARCH="arm920t"
+export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm920t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.armv4t b/scripts/tune/env.fake-arm920t.armv4t
index 6fe42d0572..de5456ae01 100644
--- a/scripts/tune/env.fake-arm920t.armv4t
+++ b/scripts/tune/env.fake-arm920t.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.armv4tb b/scripts/tune/env.fake-arm920t.armv4tb
index a766d1f80a..8c96e7e4b5 100644
--- a/scripts/tune/env.fake-arm920t.armv4tb
+++ b/scripts/tune/env.fake-arm920t.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs b/scripts/tune/env.fake-arm926ejs
index 6a3a634374..3fcca37e9c 100644
--- a/scripts/tune/env.fake-arm926ejs
+++ b/scripts/tune/env.fake-arm926ejs
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp arm926ejs"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.arm926ejs b/scripts/tune/env.fake-arm926ejs.arm926ejs
index 16389c0e80..ec3d0b6be0 100644
--- a/scripts/tune/env.fake-arm926ejs.arm926ejs
+++ b/scripts/tune/env.fake-arm926ejs.arm926ejs
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te arm926ejste arm926ejse fake_arm926ejs"
-TUNE_CCARGS=" -mthumb -mcpu=arm926ej-s"
+TUNE_CCARGS=" -marm -mcpu=arm926ej-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp arm926ejs"
-TUNE_PKGARCH="arm926ejste"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm926ej-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm926ejse"
+export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm926ej-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv4t b/scripts/tune/env.fake-arm926ejs.armv4t
index 2df887cf93..ba97695bac 100644
--- a/scripts/tune/env.fake-arm926ejs.armv4t
+++ b/scripts/tune/env.fake-arm926ejs.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm926ejs"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv4tb b/scripts/tune/env.fake-arm926ejs.armv4tb
index 6f0a60563d..187605e000 100644
--- a/scripts/tune/env.fake-arm926ejs.armv4tb
+++ b/scripts/tune/env.fake-arm926ejs.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5t b/scripts/tune/env.fake-arm926ejs.armv5t
index 78547ec134..eedf89ce75 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5t
+++ b/scripts/tune/env.fake-arm926ejs.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5t-vfp b/scripts/tune/env.fake-arm926ejs.armv5t-vfp
index 1a8b8d989b..c72b48dde8 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5t-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tb b/scripts/tune/env.fake-arm926ejs.armv5tb
index 652c5b4e98..baf3111070 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tb
+++ b/scripts/tune/env.fake-arm926ejs.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tb-vfp b/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
index bafbd4797d..fc875df80d 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5te b/scripts/tune/env.fake-arm926ejs.armv5te
index eee087f6cf..a9806ae920 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5te
+++ b/scripts/tune/env.fake-arm926ejs.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5te-vfp b/scripts/tune/env.fake-arm926ejs.armv5te-vfp
index 6c8867f6e0..4f684c2719 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5te-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5teb b/scripts/tune/env.fake-arm926ejs.armv5teb
index 3babe52d7a..3c9b4aac78 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5teb
+++ b/scripts/tune/env.fake-arm926ejs.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5teb-vfp b/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
index 3c9751cce0..713f20b369 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp b/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
index 74b6ed0de2..333219d8cd 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp b/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
index 8d93c18baf..e9e556b7ea 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5thf-vfp b/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
index 14754b60bb..ecf0f89738 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp b/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
index bbfc39568b..dea5421aab 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi b/scripts/tune/env.fake-arm9tdmi
index a2c534d8c1..bcdb983e29 100644
--- a/scripts/tune/env.fake-arm9tdmi
+++ b/scripts/tune/env.fake-arm9tdmi
@@ -1,6 +1,6 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb arm9tdmi"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.arm9tdmi b/scripts/tune/env.fake-arm9tdmi.arm9tdmi
deleted file mode 100644
index 7700296a45..0000000000
--- a/scripts/tune/env.fake-arm9tdmi.arm9tdmi
+++ /dev/null
@@ -1,5 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm9tdmit fake_arm9tdmi"
-TUNE_CCARGS=" -mthumb -mcpu=arm9tdmi"
-TUNE_FEATURES="arm thumb arm9tdmi"
-TUNE_PKGARCH="arm9tdmit"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm9tdmi --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4t b/scripts/tune/env.fake-arm9tdmi.armv4t
index 96040e9ee4..8ce9d17921 100644
--- a/scripts/tune/env.fake-arm9tdmi.armv4t
+++ b/scripts/tune/env.fake-arm9tdmi.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4tb b/scripts/tune/env.fake-arm9tdmi.armv4tb
index 2eb20c232b..900e3a76f7 100644
--- a/scripts/tune/env.fake-arm9tdmi.armv4tb
+++ b/scripts/tune/env.fake-arm9tdmi.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0 b/scripts/tune/env.fake-cortex-m0
deleted file mode 100644
index 38e477a3af..0000000000
--- a/scripts/tune/env.fake-cortex-m0
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv6m cortexm0"
-PACKAGE_ARCHS="all any noarch armv6m cortexm0 fake_cortex_m0"
-TUNE_CCARGS=" -march=armv6s-m -mcpu=cortex-m0"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m cortexm0"
-TUNE_PKGARCH="cortexm0"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m -mcpu=cortex-m0 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv4 b/scripts/tune/env.fake-cortex-m0.armv4
deleted file mode 100644
index 25fd71ebc4..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortex_m0"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv4b b/scripts/tune/env.fake-cortex-m0.armv4b
deleted file mode 100644
index c0a67ecf7a..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortex_m0"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv4t b/scripts/tune/env.fake-cortex-m0.armv4t
deleted file mode 100644
index 2069dd1cca..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortex_m0"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv4tb b/scripts/tune/env.fake-cortex-m0.armv4tb
deleted file mode 100644
index bdcf35efa6..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortex_m0"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5 b/scripts/tune/env.fake-cortex-m0.armv5
deleted file mode 100644
index 7a75e84c07..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5-vfp b/scripts/tune/env.fake-cortex-m0.armv5-vfp
deleted file mode 100644
index b7eb6fc88d..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5b b/scripts/tune/env.fake-cortex-m0.armv5b
deleted file mode 100644
index 0bd02e3bf7..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5b-vfp b/scripts/tune/env.fake-cortex-m0.armv5b-vfp
deleted file mode 100644
index db49764db6..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5hf-vfp b/scripts/tune/env.fake-cortex-m0.armv5hf-vfp
deleted file mode 100644
index 688c07fc76..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5hfb-vfp b/scripts/tune/env.fake-cortex-m0.armv5hfb-vfp
deleted file mode 100644
index 6f6356588c..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5t b/scripts/tune/env.fake-cortex-m0.armv5t
deleted file mode 100644
index ec0162bbf7..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5t-vfp b/scripts/tune/env.fake-cortex-m0.armv5t-vfp
deleted file mode 100644
index d94a6b8b51..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5tb b/scripts/tune/env.fake-cortex-m0.armv5tb
deleted file mode 100644
index 2616319089..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5tb-vfp b/scripts/tune/env.fake-cortex-m0.armv5tb-vfp
deleted file mode 100644
index 7e1834fd7e..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5thf-vfp b/scripts/tune/env.fake-cortex-m0.armv5thf-vfp
deleted file mode 100644
index 81ccc5cdc5..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv5thfb-vfp b/scripts/tune/env.fake-cortex-m0.armv5thfb-vfp
deleted file mode 100644
index 3bf35fe496..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortex_m0"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.armv6m b/scripts/tune/env.fake-cortex-m0.armv6m
deleted file mode 100644
index 62745962ea..0000000000
--- a/scripts/tune/env.fake-cortex-m0.armv6m
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv6m fake_cortex_m0"
-TUNE_CCARGS=" -march=armv6s-m"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m"
-TUNE_PKGARCH="armv6m"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0.cortexm0 b/scripts/tune/env.fake-cortex-m0.cortexm0
deleted file mode 100644
index cfe33c758e..0000000000
--- a/scripts/tune/env.fake-cortex-m0.cortexm0
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv6m cortexm0 fake_cortex_m0"
-TUNE_CCARGS=" -march=armv6s-m -mcpu=cortex-m0"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m cortexm0"
-TUNE_PKGARCH="cortexm0"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m -mcpu=cortex-m0 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus b/scripts/tune/env.fake-cortex-m0plus
deleted file mode 100644
index f64f70f3b7..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv6m cortexm0-plus"
-PACKAGE_ARCHS="all any noarch armv6m cortexm0-plus fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv6s-m -mcpu=cortex-m0plus"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m cortexm0-plus"
-TUNE_PKGARCH="cortexm0-plus"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m -mcpu=cortex-m0plus --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv4 b/scripts/tune/env.fake-cortex-m0plus.armv4
deleted file mode 100644
index 3a14163d1b..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv4b b/scripts/tune/env.fake-cortex-m0plus.armv4b
deleted file mode 100644
index 4521f2928b..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv4t b/scripts/tune/env.fake-cortex-m0plus.armv4t
deleted file mode 100644
index 4d1d73469e..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv4tb b/scripts/tune/env.fake-cortex-m0plus.armv4tb
deleted file mode 100644
index b97d2b4eaf..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5 b/scripts/tune/env.fake-cortex-m0plus.armv5
deleted file mode 100644
index b8615e0d8d..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5-vfp
deleted file mode 100644
index b114819e83..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5b b/scripts/tune/env.fake-cortex-m0plus.armv5b
deleted file mode 100644
index 6dfc11855d..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5b-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5b-vfp
deleted file mode 100644
index b30cad5452..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5hf-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5hf-vfp
deleted file mode 100644
index c1006964b8..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5hfb-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5hfb-vfp
deleted file mode 100644
index 3f7646d5ef..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5t b/scripts/tune/env.fake-cortex-m0plus.armv5t
deleted file mode 100644
index d2c3f86621..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5t-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5t-vfp
deleted file mode 100644
index f943e3b6fc..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5tb b/scripts/tune/env.fake-cortex-m0plus.armv5tb
deleted file mode 100644
index 01e1a78904..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5tb-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5tb-vfp
deleted file mode 100644
index 11f72c5d3b..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5thf-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5thf-vfp
deleted file mode 100644
index 9505cac643..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv5thfb-vfp b/scripts/tune/env.fake-cortex-m0plus.armv5thfb-vfp
deleted file mode 100644
index 60159762b2..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.armv6m b/scripts/tune/env.fake-cortex-m0plus.armv6m
deleted file mode 100644
index 0102c360ac..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.armv6m
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv6m fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv6s-m"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m"
-TUNE_PKGARCH="armv6m"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortex-m0plus.cortexm0-plus b/scripts/tune/env.fake-cortex-m0plus.cortexm0-plus
deleted file mode 100644
index 1d016d3ced..0000000000
--- a/scripts/tune/env.fake-cortex-m0plus.cortexm0-plus
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv6m cortexm0-plus fake_cortex_m0plus"
-TUNE_CCARGS=" -march=armv6s-m -mcpu=cortex-m0plus"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="armv6m cortexm0-plus"
-TUNE_PKGARCH="cortexm0-plus"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6s-m -mcpu=cortex-m0plus --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa32.armv8a b/scripts/tune/env.fake-cortexa32.armv8a
index caabd7e7cc..3f7feaad24 100644
--- a/scripts/tune/env.fake-cortexa32.armv8a
+++ b/scripts/tune/env.fake-cortexa32.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa32.armv8a-crc b/scripts/tune/env.fake-cortexa32.armv8a-crc
index 89468f1800..fc97b68c67 100644
--- a/scripts/tune/env.fake-cortexa32.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa32.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa32.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa32.armv8a-crc-crypto
index 1699fd5eaa..826423c0ca 100644
--- a/scripts/tune/env.fake-cortexa32.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa32.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa32.armv8a-crypto b/scripts/tune/env.fake-cortexa32.armv8a-crypto
index 1c160222be..8f5a24814c 100644
--- a/scripts/tune/env.fake-cortexa32.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa32.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34 b/scripts/tune/env.fake-cortexa34
deleted file mode 100644
index 7c098e3e0f..0000000000
--- a/scripts/tune/env.fake-cortexa34
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa34 cortexa34-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa34 fake_cortexa34"
-TUNE_CCARGS=" -mcpu=cortex-a34 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa34"
-TUNE_PKGARCH="cortexa34"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a34 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.aarch64 b/scripts/tune/env.fake-cortexa34.aarch64
deleted file mode 100644
index 9e7e1cb67e..0000000000
--- a/scripts/tune/env.fake-cortexa34.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa34"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.aarch64_be b/scripts/tune/env.fake-cortexa34.aarch64_be
deleted file mode 100644
index fddb327397..0000000000
--- a/scripts/tune/env.fake-cortexa34.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa34"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv4 b/scripts/tune/env.fake-cortexa34.armv4
deleted file mode 100644
index 32b2d74fb1..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv4b b/scripts/tune/env.fake-cortexa34.armv4b
deleted file mode 100644
index a9c1f61600..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa34"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv4t b/scripts/tune/env.fake-cortexa34.armv4t
deleted file mode 100644
index e6cc93e977..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa34"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv4tb b/scripts/tune/env.fake-cortexa34.armv4tb
deleted file mode 100644
index f674567220..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa34"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5 b/scripts/tune/env.fake-cortexa34.armv5
deleted file mode 100644
index 93ca98ef69..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5-vfp b/scripts/tune/env.fake-cortexa34.armv5-vfp
deleted file mode 100644
index 3fc8d88946..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5b b/scripts/tune/env.fake-cortexa34.armv5b
deleted file mode 100644
index 968da45f43..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5b-vfp b/scripts/tune/env.fake-cortexa34.armv5b-vfp
deleted file mode 100644
index 2af90eeb4b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5e b/scripts/tune/env.fake-cortexa34.armv5e
deleted file mode 100644
index 63e294a8cc..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5e-vfp b/scripts/tune/env.fake-cortexa34.armv5e-vfp
deleted file mode 100644
index f2b4f167c4..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5eb b/scripts/tune/env.fake-cortexa34.armv5eb
deleted file mode 100644
index c3c1c6cf24..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5eb-vfp b/scripts/tune/env.fake-cortexa34.armv5eb-vfp
deleted file mode 100644
index 95a436dddb..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5ehf-vfp b/scripts/tune/env.fake-cortexa34.armv5ehf-vfp
deleted file mode 100644
index f831536214..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa34.armv5ehfb-vfp
deleted file mode 100644
index ac2697c7e4..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5hf-vfp b/scripts/tune/env.fake-cortexa34.armv5hf-vfp
deleted file mode 100644
index a345967401..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5hfb-vfp b/scripts/tune/env.fake-cortexa34.armv5hfb-vfp
deleted file mode 100644
index 957016e4c2..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5t b/scripts/tune/env.fake-cortexa34.armv5t
deleted file mode 100644
index 559df3acf3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5t-vfp b/scripts/tune/env.fake-cortexa34.armv5t-vfp
deleted file mode 100644
index 3397b57aa4..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5tb b/scripts/tune/env.fake-cortexa34.armv5tb
deleted file mode 100644
index 94bfd7555d..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5tb-vfp b/scripts/tune/env.fake-cortexa34.armv5tb-vfp
deleted file mode 100644
index 320f3262d1..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5te b/scripts/tune/env.fake-cortexa34.armv5te
deleted file mode 100644
index bf6cb1c7bc..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5te-vfp b/scripts/tune/env.fake-cortexa34.armv5te-vfp
deleted file mode 100644
index 70f2b5923b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5teb b/scripts/tune/env.fake-cortexa34.armv5teb
deleted file mode 100644
index 8619b1f727..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5teb-vfp b/scripts/tune/env.fake-cortexa34.armv5teb-vfp
deleted file mode 100644
index e8017925b7..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5tehf-vfp b/scripts/tune/env.fake-cortexa34.armv5tehf-vfp
deleted file mode 100644
index b3f3027b4b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa34.armv5tehfb-vfp
deleted file mode 100644
index 6079556103..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5thf-vfp b/scripts/tune/env.fake-cortexa34.armv5thf-vfp
deleted file mode 100644
index 3cc06003ad..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv5thfb-vfp b/scripts/tune/env.fake-cortexa34.armv5thfb-vfp
deleted file mode 100644
index febbfc9319..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6 b/scripts/tune/env.fake-cortexa34.armv6
deleted file mode 100644
index 3da3e9151e..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6-novfp b/scripts/tune/env.fake-cortexa34.armv6-novfp
deleted file mode 100644
index 83b498c420..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa34"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6b b/scripts/tune/env.fake-cortexa34.armv6b
deleted file mode 100644
index 53f4f5e833..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6b-novfp b/scripts/tune/env.fake-cortexa34.armv6b-novfp
deleted file mode 100644
index 76e77d44f4..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa34"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6hf b/scripts/tune/env.fake-cortexa34.armv6hf
deleted file mode 100644
index ce34bf37ce..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6hfb b/scripts/tune/env.fake-cortexa34.armv6hfb
deleted file mode 100644
index 42df6eb77b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6t b/scripts/tune/env.fake-cortexa34.armv6t
deleted file mode 100644
index 3df7c1a09a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6t-novfp b/scripts/tune/env.fake-cortexa34.armv6t-novfp
deleted file mode 100644
index 46e02381ab..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6tb b/scripts/tune/env.fake-cortexa34.armv6tb
deleted file mode 100644
index 9cdc5c38b5..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6tb-novfp b/scripts/tune/env.fake-cortexa34.armv6tb-novfp
deleted file mode 100644
index 607fe47c57..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6thf b/scripts/tune/env.fake-cortexa34.armv6thf
deleted file mode 100644
index 5a24a99d2f..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv6thfb b/scripts/tune/env.fake-cortexa34.armv6thfb
deleted file mode 100644
index 0a0b1918ad..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a b/scripts/tune/env.fake-cortexa34.armv7a
deleted file mode 100644
index 5a1bab7332..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a-neon b/scripts/tune/env.fake-cortexa34.armv7a-neon
deleted file mode 100644
index 90e8ae6145..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7a-neon-vfpv4
deleted file mode 100644
index 2f427863e5..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7a-vfpv3
deleted file mode 100644
index 071bc9d844..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7a-vfpv3d16
deleted file mode 100644
index 3dd40c495d..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7a-vfpv4d16
deleted file mode 100644
index ed6efab7e9..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab b/scripts/tune/env.fake-cortexa34.armv7ab
deleted file mode 100644
index d278fd74b3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab-neon b/scripts/tune/env.fake-cortexa34.armv7ab-neon
deleted file mode 100644
index dba9feb0ac..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7ab-neon-vfpv4
deleted file mode 100644
index b026bdeba3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3
deleted file mode 100644
index cd223854bf..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3d16
deleted file mode 100644
index bd2999ebb6..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7ab-vfpv4d16
deleted file mode 100644
index d0ec7165ad..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf b/scripts/tune/env.fake-cortexa34.armv7ahf
deleted file mode 100644
index b74f4646fe..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf-neon b/scripts/tune/env.fake-cortexa34.armv7ahf-neon
deleted file mode 100644
index 18404c5f93..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7ahf-neon-vfpv4
deleted file mode 100644
index d41be37c7b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3
deleted file mode 100644
index f195621c3e..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3d16
deleted file mode 100644
index 16c181c432..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv4d16
deleted file mode 100644
index 090ee09d62..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb b/scripts/tune/env.fake-cortexa34.armv7ahfb
deleted file mode 100644
index c258994f86..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb-neon b/scripts/tune/env.fake-cortexa34.armv7ahfb-neon
deleted file mode 100644
index ee0fe44e18..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 3dfa525c1b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3
deleted file mode 100644
index 3c51fa741a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3d16
deleted file mode 100644
index a29355718b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv4d16
deleted file mode 100644
index 2d64cf116a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at b/scripts/tune/env.fake-cortexa34.armv7at
deleted file mode 100644
index 94253830fc..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at-neon b/scripts/tune/env.fake-cortexa34.armv7at-neon
deleted file mode 100644
index c841267412..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7at-neon-vfpv4
deleted file mode 100644
index 14ee7b90f8..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7at-vfpv3
deleted file mode 100644
index 22b6f6be34..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7at-vfpv3d16
deleted file mode 100644
index 898a85a092..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7at-vfpv4d16
deleted file mode 100644
index 698f4e3117..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb b/scripts/tune/env.fake-cortexa34.armv7atb
deleted file mode 100644
index 18f6b5803b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb-neon b/scripts/tune/env.fake-cortexa34.armv7atb-neon
deleted file mode 100644
index 013408d9ba..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7atb-neon-vfpv4
deleted file mode 100644
index 1d7be2ee2d..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3
deleted file mode 100644
index 7619d149a1..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3d16
deleted file mode 100644
index a20aa5fcd6..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7atb-vfpv4d16
deleted file mode 100644
index 1133e12971..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf b/scripts/tune/env.fake-cortexa34.armv7athf
deleted file mode 100644
index 5b21ce6377..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf-neon b/scripts/tune/env.fake-cortexa34.armv7athf-neon
deleted file mode 100644
index 59d5c3f43e..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7athf-neon-vfpv4
deleted file mode 100644
index 36f0049d0a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3
deleted file mode 100644
index e93587ed9b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3d16
deleted file mode 100644
index 5ad4a47db7..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7athf-vfpv4d16
deleted file mode 100644
index d5534ddd61..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb b/scripts/tune/env.fake-cortexa34.armv7athfb
deleted file mode 100644
index c514c61ecc..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb-neon b/scripts/tune/env.fake-cortexa34.armv7athfb-neon
deleted file mode 100644
index f7dafce2a1..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7athfb-neon-vfpv4
deleted file mode 100644
index e8c99d4a2c..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3
deleted file mode 100644
index 6e7c6ff742..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3d16
deleted file mode 100644
index 0d9c651455..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv4d16
deleted file mode 100644
index 1f4f357237..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve b/scripts/tune/env.fake-cortexa34.armv7ve
deleted file mode 100644
index 74a95b2fc3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve-neon b/scripts/tune/env.fake-cortexa34.armv7ve-neon
deleted file mode 100644
index b5a662baa8..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7ve-neon-vfpv4
deleted file mode 100644
index 101f65e7ea..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3
deleted file mode 100644
index c14eb3f68b..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3d16
deleted file mode 100644
index 2410f68422..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7ve-vfpv4d16
deleted file mode 100644
index fc33525a41..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb b/scripts/tune/env.fake-cortexa34.armv7veb
deleted file mode 100644
index d8df5805ae..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb-neon b/scripts/tune/env.fake-cortexa34.armv7veb-neon
deleted file mode 100644
index 072dd1ee09..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7veb-neon-vfpv4
deleted file mode 100644
index a95610fbc7..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3
deleted file mode 100644
index 3c7ecf9a80..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3d16
deleted file mode 100644
index 2c06f997bc..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7veb-vfpv4d16
deleted file mode 100644
index 26a02ff7fd..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf b/scripts/tune/env.fake-cortexa34.armv7vehf
deleted file mode 100644
index 67254ab4c5..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf-neon b/scripts/tune/env.fake-cortexa34.armv7vehf-neon
deleted file mode 100644
index f7193016ad..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vehf-neon-vfpv4
deleted file mode 100644
index e6684a6a1a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3
deleted file mode 100644
index 87defdd5b8..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3d16
deleted file mode 100644
index accfc62a60..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv4d16
deleted file mode 100644
index aea3a04a57..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb b/scripts/tune/env.fake-cortexa34.armv7vehfb
deleted file mode 100644
index 0c510f8401..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb-neon b/scripts/tune/env.fake-cortexa34.armv7vehfb-neon
deleted file mode 100644
index 2783385925..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vehfb-neon-vfpv4
deleted file mode 100644
index deb5eeca28..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3
deleted file mode 100644
index 008a1933a3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3d16
deleted file mode 100644
index c3e8bf7f91..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv4d16
deleted file mode 100644
index 7ce90ec717..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet b/scripts/tune/env.fake-cortexa34.armv7vet
deleted file mode 100644
index 208c869a8c..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet-neon b/scripts/tune/env.fake-cortexa34.armv7vet-neon
deleted file mode 100644
index 1fa75aee37..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vet-neon-vfpv4
deleted file mode 100644
index b10cd5f7da..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3
deleted file mode 100644
index 9a10f9125d..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3d16
deleted file mode 100644
index b1f0cf6ce9..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vet-vfpv4d16
deleted file mode 100644
index 6e730b22cf..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb b/scripts/tune/env.fake-cortexa34.armv7vetb
deleted file mode 100644
index 2ad6d65321..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb-neon b/scripts/tune/env.fake-cortexa34.armv7vetb-neon
deleted file mode 100644
index 57c9b29b97..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vetb-neon-vfpv4
deleted file mode 100644
index d119d86a6f..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3
deleted file mode 100644
index a033ba81e7..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3d16
deleted file mode 100644
index f6c2242a5a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv4d16
deleted file mode 100644
index c0d518e821..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf b/scripts/tune/env.fake-cortexa34.armv7vethf
deleted file mode 100644
index 852f45cd09..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf-neon b/scripts/tune/env.fake-cortexa34.armv7vethf-neon
deleted file mode 100644
index 9e7ffd28aa..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vethf-neon-vfpv4
deleted file mode 100644
index 8374b3265a..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3
deleted file mode 100644
index 312ec1b1fb..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3d16
deleted file mode 100644
index e065926258..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv4d16
deleted file mode 100644
index bd3686ab11..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb b/scripts/tune/env.fake-cortexa34.armv7vethfb
deleted file mode 100644
index e51a596fa3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb-neon b/scripts/tune/env.fake-cortexa34.armv7vethfb-neon
deleted file mode 100644
index 04a4eb55d3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa34.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 21575cdb4c..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3
deleted file mode 100644
index 5c6971afad..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3d16
deleted file mode 100644
index 367dd0ac2f..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv4d16
deleted file mode 100644
index 47164681b6..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa34"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv8a b/scripts/tune/env.fake-cortexa34.armv8a
deleted file mode 100644
index 34b3fac3bf..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa34"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv8a-crc b/scripts/tune/env.fake-cortexa34.armv8a-crc
deleted file mode 100644
index 5a7434c8f3..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa34"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa34.armv8a-crc-crypto
deleted file mode 100644
index ebb990bd80..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa34"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.armv8a-crypto b/scripts/tune/env.fake-cortexa34.armv8a-crypto
deleted file mode 100644
index ccb438661c..0000000000
--- a/scripts/tune/env.fake-cortexa34.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa34"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.cortexa34 b/scripts/tune/env.fake-cortexa34.cortexa34
deleted file mode 100644
index 47bcf27713..0000000000
--- a/scripts/tune/env.fake-cortexa34.cortexa34
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa34 fake_cortexa34"
-TUNE_CCARGS=" -mcpu=cortex-a34 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa34"
-TUNE_PKGARCH="cortexa34"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a34 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa34.cortexa34-crypto b/scripts/tune/env.fake-cortexa34.cortexa34-crypto
deleted file mode 100644
index f964129e08..0000000000
--- a/scripts/tune/env.fake-cortexa34.cortexa34-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa34 cortexa34-crypto fake_cortexa34"
-TUNE_CCARGS=" -mcpu=cortex-a34 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa34 crypto"
-TUNE_PKGARCH="cortexa34"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a34 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35 b/scripts/tune/env.fake-cortexa35
index 787fbb46f6..029ef5af3c 100644
--- a/scripts/tune/env.fake-cortexa35
+++ b/scripts/tune/env.fake-cortexa35
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa35 cortexa35-crypto"
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa35 fake_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a35 -march=armv8-a+crc"
+TUNE_CCARGS=" -mcpu=cortex-a35+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa35"
-TUNE_PKGARCH="cortexa35"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa35 crc"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.armv8a b/scripts/tune/env.fake-cortexa35.armv8a
index f597f517c4..1087f051c1 100644
--- a/scripts/tune/env.fake-cortexa35.armv8a
+++ b/scripts/tune/env.fake-cortexa35.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.armv8a-crc b/scripts/tune/env.fake-cortexa35.armv8a-crc
index 7b9356f625..3186b4fe02 100644
--- a/scripts/tune/env.fake-cortexa35.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa35.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa35.armv8a-crc-crypto
index 83445d697c..933301eb91 100644
--- a/scripts/tune/env.fake-cortexa35.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa35.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.armv8a-crypto b/scripts/tune/env.fake-cortexa35.armv8a-crypto
index e454a4dbfa..89e0909289 100644
--- a/scripts/tune/env.fake-cortexa35.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa35.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.cortexa35 b/scripts/tune/env.fake-cortexa35.cortexa35
index 069594c2d7..17bb8c1e90 100644
--- a/scripts/tune/env.fake-cortexa35.cortexa35
+++ b/scripts/tune/env.fake-cortexa35.cortexa35
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa35 fake_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a35 -march=armv8-a+crc"
+TUNE_CCARGS=" -mcpu=cortex-a35+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa35"
-TUNE_PKGARCH="cortexa35"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa35 crc"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa35.cortexa35-crypto b/scripts/tune/env.fake-cortexa35.cortexa35-crypto
index b3296724bd..1d12a34c24 100644
--- a/scripts/tune/env.fake-cortexa35.cortexa35-crypto
+++ b/scripts/tune/env.fake-cortexa35.cortexa35-crypto
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa35 cortexa35-crypto fake_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a35 -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -mcpu=cortex-a35+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa35 crypto"
-TUNE_PKGARCH="cortexa35"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa35 crc crypto"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a35+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53 b/scripts/tune/env.fake-cortexa53
index 330b83caa0..677a51319e 100644
--- a/scripts/tune/env.fake-cortexa53
+++ b/scripts/tune/env.fake-cortexa53
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa53 cortexa53-crypto"
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa53 fake_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a53 -march=armv8-a+crc"
+TUNE_CCARGS=" -mcpu=cortex-a53+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa53"
-TUNE_PKGARCH="cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa53 crc"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.armv8a b/scripts/tune/env.fake-cortexa53.armv8a
index a680c2b9da..eb4948a98e 100644
--- a/scripts/tune/env.fake-cortexa53.armv8a
+++ b/scripts/tune/env.fake-cortexa53.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.armv8a-crc b/scripts/tune/env.fake-cortexa53.armv8a-crc
index b15a86e41d..4f7c47e0b2 100644
--- a/scripts/tune/env.fake-cortexa53.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa53.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa53.armv8a-crc-crypto
index 70661d08be..1596771fae 100644
--- a/scripts/tune/env.fake-cortexa53.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa53.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.armv8a-crypto b/scripts/tune/env.fake-cortexa53.armv8a-crypto
index d25b7baf13..57ffede84f 100644
--- a/scripts/tune/env.fake-cortexa53.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa53.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.cortexa53 b/scripts/tune/env.fake-cortexa53.cortexa53
index 06ee767b9b..d4fa284ff7 100644
--- a/scripts/tune/env.fake-cortexa53.cortexa53
+++ b/scripts/tune/env.fake-cortexa53.cortexa53
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa53 fake_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a53 -march=armv8-a+crc"
+TUNE_CCARGS=" -mcpu=cortex-a53+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa53"
-TUNE_PKGARCH="cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa53 crc"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa53.cortexa53-crypto b/scripts/tune/env.fake-cortexa53.cortexa53-crypto
index 18a4fe2016..3bef65ad7c 100644
--- a/scripts/tune/env.fake-cortexa53.cortexa53-crypto
+++ b/scripts/tune/env.fake-cortexa53.cortexa53-crypto
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa53 cortexa53-crypto fake_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a53 -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -mcpu=cortex-a53+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa53 crypto"
-TUNE_PKGARCH="cortexa53-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa53 crc crypto"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a53+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55 b/scripts/tune/env.fake-cortexa55
deleted file mode 100644
index bc6d94058d..0000000000
--- a/scripts/tune/env.fake-cortexa55
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa55"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa55 fake_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a55 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa55"
-TUNE_PKGARCH="cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a55 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.aarch64 b/scripts/tune/env.fake-cortexa55.aarch64
deleted file mode 100644
index 7f4379271f..0000000000
--- a/scripts/tune/env.fake-cortexa55.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.aarch64_be b/scripts/tune/env.fake-cortexa55.aarch64_be
deleted file mode 100644
index 2dfd60ef92..0000000000
--- a/scripts/tune/env.fake-cortexa55.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv4 b/scripts/tune/env.fake-cortexa55.armv4
deleted file mode 100644
index 692d298d2c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv4b b/scripts/tune/env.fake-cortexa55.armv4b
deleted file mode 100644
index 339848414a..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv4t b/scripts/tune/env.fake-cortexa55.armv4t
deleted file mode 100644
index 38222f36b8..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv4tb b/scripts/tune/env.fake-cortexa55.armv4tb
deleted file mode 100644
index c1ad922718..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5 b/scripts/tune/env.fake-cortexa55.armv5
deleted file mode 100644
index d6fc04d142..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5-vfp b/scripts/tune/env.fake-cortexa55.armv5-vfp
deleted file mode 100644
index d57e96f228..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5b b/scripts/tune/env.fake-cortexa55.armv5b
deleted file mode 100644
index 02229e3f39..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5b-vfp b/scripts/tune/env.fake-cortexa55.armv5b-vfp
deleted file mode 100644
index 69e05e8e58..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5e b/scripts/tune/env.fake-cortexa55.armv5e
deleted file mode 100644
index 34e00ae1e9..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5e-vfp b/scripts/tune/env.fake-cortexa55.armv5e-vfp
deleted file mode 100644
index 6da31e2411..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5eb b/scripts/tune/env.fake-cortexa55.armv5eb
deleted file mode 100644
index abf84d1e28..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5eb-vfp b/scripts/tune/env.fake-cortexa55.armv5eb-vfp
deleted file mode 100644
index dcbbc493e8..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5ehf-vfp b/scripts/tune/env.fake-cortexa55.armv5ehf-vfp
deleted file mode 100644
index 32c10065d6..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa55.armv5ehfb-vfp
deleted file mode 100644
index b8a5001695..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5hf-vfp b/scripts/tune/env.fake-cortexa55.armv5hf-vfp
deleted file mode 100644
index fd0a6fe405..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5hfb-vfp b/scripts/tune/env.fake-cortexa55.armv5hfb-vfp
deleted file mode 100644
index 326be73464..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5t b/scripts/tune/env.fake-cortexa55.armv5t
deleted file mode 100644
index e489df622a..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5t-vfp b/scripts/tune/env.fake-cortexa55.armv5t-vfp
deleted file mode 100644
index 48ace651b2..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5tb b/scripts/tune/env.fake-cortexa55.armv5tb
deleted file mode 100644
index 5fae43914e..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5tb-vfp b/scripts/tune/env.fake-cortexa55.armv5tb-vfp
deleted file mode 100644
index e0d3a3783c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5te b/scripts/tune/env.fake-cortexa55.armv5te
deleted file mode 100644
index c922e0e874..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5te-vfp b/scripts/tune/env.fake-cortexa55.armv5te-vfp
deleted file mode 100644
index fbc6ee7240..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5teb b/scripts/tune/env.fake-cortexa55.armv5teb
deleted file mode 100644
index cde6ff6f7b..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5teb-vfp b/scripts/tune/env.fake-cortexa55.armv5teb-vfp
deleted file mode 100644
index 9d3f57e0cf..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5tehf-vfp b/scripts/tune/env.fake-cortexa55.armv5tehf-vfp
deleted file mode 100644
index 921f20d46e..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa55.armv5tehfb-vfp
deleted file mode 100644
index ae398ed1b7..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5thf-vfp b/scripts/tune/env.fake-cortexa55.armv5thf-vfp
deleted file mode 100644
index fd52c2f4ae..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv5thfb-vfp b/scripts/tune/env.fake-cortexa55.armv5thfb-vfp
deleted file mode 100644
index 5206ca26dd..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6 b/scripts/tune/env.fake-cortexa55.armv6
deleted file mode 100644
index 97b030d41a..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6-novfp b/scripts/tune/env.fake-cortexa55.armv6-novfp
deleted file mode 100644
index f10d4d5d8d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6b b/scripts/tune/env.fake-cortexa55.armv6b
deleted file mode 100644
index 77bce3c5bf..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6b-novfp b/scripts/tune/env.fake-cortexa55.armv6b-novfp
deleted file mode 100644
index b12c3859b2..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6hf b/scripts/tune/env.fake-cortexa55.armv6hf
deleted file mode 100644
index 8a288e94c9..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6hfb b/scripts/tune/env.fake-cortexa55.armv6hfb
deleted file mode 100644
index 4091f3d06e..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6t b/scripts/tune/env.fake-cortexa55.armv6t
deleted file mode 100644
index 3559d5b029..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6t-novfp b/scripts/tune/env.fake-cortexa55.armv6t-novfp
deleted file mode 100644
index 25ba68d843..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6tb b/scripts/tune/env.fake-cortexa55.armv6tb
deleted file mode 100644
index ee698c6a5d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6tb-novfp b/scripts/tune/env.fake-cortexa55.armv6tb-novfp
deleted file mode 100644
index c2e4bb272b..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6thf b/scripts/tune/env.fake-cortexa55.armv6thf
deleted file mode 100644
index 1fe6814170..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv6thfb b/scripts/tune/env.fake-cortexa55.armv6thfb
deleted file mode 100644
index 15e1e1d939..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a b/scripts/tune/env.fake-cortexa55.armv7a
deleted file mode 100644
index 84c2348359..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a-neon b/scripts/tune/env.fake-cortexa55.armv7a-neon
deleted file mode 100644
index a6dc3b53dc..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7a-neon-vfpv4
deleted file mode 100644
index 0aecd62b7f..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7a-vfpv3
deleted file mode 100644
index acbb2ff4d2..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7a-vfpv3d16
deleted file mode 100644
index 0fb3b5c903..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7a-vfpv4d16
deleted file mode 100644
index ae84df6561..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab b/scripts/tune/env.fake-cortexa55.armv7ab
deleted file mode 100644
index 2c6e7910ac..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab-neon b/scripts/tune/env.fake-cortexa55.armv7ab-neon
deleted file mode 100644
index e31c591814..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7ab-neon-vfpv4
deleted file mode 100644
index 2a9ae5281d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3
deleted file mode 100644
index c71f35efbb..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3d16
deleted file mode 100644
index af569f4ad6..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7ab-vfpv4d16
deleted file mode 100644
index c4919edf87..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf b/scripts/tune/env.fake-cortexa55.armv7ahf
deleted file mode 100644
index a8cd5f8f3e..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf-neon b/scripts/tune/env.fake-cortexa55.armv7ahf-neon
deleted file mode 100644
index 36ce3d7082..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7ahf-neon-vfpv4
deleted file mode 100644
index 47f390d776..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3
deleted file mode 100644
index 6ad1e72a49..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3d16
deleted file mode 100644
index f0927eb5b2..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv4d16
deleted file mode 100644
index a530bd6cab..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb b/scripts/tune/env.fake-cortexa55.armv7ahfb
deleted file mode 100644
index 4cead70dad..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb-neon b/scripts/tune/env.fake-cortexa55.armv7ahfb-neon
deleted file mode 100644
index 24a6ec8403..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 990d1f4284..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3
deleted file mode 100644
index f28993dd17..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3d16
deleted file mode 100644
index 242297075d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv4d16
deleted file mode 100644
index 03d0244ea7..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at b/scripts/tune/env.fake-cortexa55.armv7at
deleted file mode 100644
index fca3d9eeaf..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at-neon b/scripts/tune/env.fake-cortexa55.armv7at-neon
deleted file mode 100644
index 03da713968..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7at-neon-vfpv4
deleted file mode 100644
index aec6a433a2..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7at-vfpv3
deleted file mode 100644
index 0d49b080fc..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7at-vfpv3d16
deleted file mode 100644
index 677c804cfd..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7at-vfpv4d16
deleted file mode 100644
index 6e3766ca81..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb b/scripts/tune/env.fake-cortexa55.armv7atb
deleted file mode 100644
index a433b07e4d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb-neon b/scripts/tune/env.fake-cortexa55.armv7atb-neon
deleted file mode 100644
index fd85c994ef..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7atb-neon-vfpv4
deleted file mode 100644
index 3f34a17a69..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3
deleted file mode 100644
index 8258e2bb86..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3d16
deleted file mode 100644
index a455f1aa50..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7atb-vfpv4d16
deleted file mode 100644
index 3ccbc8a54f..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf b/scripts/tune/env.fake-cortexa55.armv7athf
deleted file mode 100644
index d2085987b1..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf-neon b/scripts/tune/env.fake-cortexa55.armv7athf-neon
deleted file mode 100644
index d74873aaa5..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7athf-neon-vfpv4
deleted file mode 100644
index 00d01a4859..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3
deleted file mode 100644
index 7b96b17731..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3d16
deleted file mode 100644
index a577606b1c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7athf-vfpv4d16
deleted file mode 100644
index a01e94f62d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb b/scripts/tune/env.fake-cortexa55.armv7athfb
deleted file mode 100644
index e37f79a70f..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb-neon b/scripts/tune/env.fake-cortexa55.armv7athfb-neon
deleted file mode 100644
index 3b5077e875..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7athfb-neon-vfpv4
deleted file mode 100644
index f7c411e502..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3
deleted file mode 100644
index dd7544f2b9..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3d16
deleted file mode 100644
index 6f29fe43ab..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv4d16
deleted file mode 100644
index 6d8072ed1c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve b/scripts/tune/env.fake-cortexa55.armv7ve
deleted file mode 100644
index 157f38feb5..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve-neon b/scripts/tune/env.fake-cortexa55.armv7ve-neon
deleted file mode 100644
index a23aa06c20..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7ve-neon-vfpv4
deleted file mode 100644
index c99a673497..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3
deleted file mode 100644
index d380064a2f..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3d16
deleted file mode 100644
index 01e57f6847..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7ve-vfpv4d16
deleted file mode 100644
index 0138dc7bb3..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb b/scripts/tune/env.fake-cortexa55.armv7veb
deleted file mode 100644
index 57b2e155c1..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb-neon b/scripts/tune/env.fake-cortexa55.armv7veb-neon
deleted file mode 100644
index e3a3c5888c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7veb-neon-vfpv4
deleted file mode 100644
index bad4683bfe..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3
deleted file mode 100644
index eb3cd02658..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3d16
deleted file mode 100644
index 74577e3fc0..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7veb-vfpv4d16
deleted file mode 100644
index 6a18a2c4a4..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf b/scripts/tune/env.fake-cortexa55.armv7vehf
deleted file mode 100644
index 6657f06bd0..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf-neon b/scripts/tune/env.fake-cortexa55.armv7vehf-neon
deleted file mode 100644
index 9f99dd6ecd..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vehf-neon-vfpv4
deleted file mode 100644
index 564e70d34b..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3
deleted file mode 100644
index 1166922009..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3d16
deleted file mode 100644
index f3c53738eb..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv4d16
deleted file mode 100644
index 0e77b77fba..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb b/scripts/tune/env.fake-cortexa55.armv7vehfb
deleted file mode 100644
index a5368861b4..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb-neon b/scripts/tune/env.fake-cortexa55.armv7vehfb-neon
deleted file mode 100644
index eba7a2c8d1..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 5b66370527..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3
deleted file mode 100644
index c5509375ea..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3d16
deleted file mode 100644
index edead99bb4..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv4d16
deleted file mode 100644
index 64eacdc64d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet b/scripts/tune/env.fake-cortexa55.armv7vet
deleted file mode 100644
index 1240da39cc..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet-neon b/scripts/tune/env.fake-cortexa55.armv7vet-neon
deleted file mode 100644
index a861c9286d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vet-neon-vfpv4
deleted file mode 100644
index 80487e1bea..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3
deleted file mode 100644
index a6d2812e2c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3d16
deleted file mode 100644
index c26c067955..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vet-vfpv4d16
deleted file mode 100644
index 2ab145b519..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb b/scripts/tune/env.fake-cortexa55.armv7vetb
deleted file mode 100644
index b685979470..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb-neon b/scripts/tune/env.fake-cortexa55.armv7vetb-neon
deleted file mode 100644
index 6acc72050a..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vetb-neon-vfpv4
deleted file mode 100644
index 7f04b6a08d..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3
deleted file mode 100644
index dec3031508..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3d16
deleted file mode 100644
index 51ce0eb905..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv4d16
deleted file mode 100644
index e3fc5dbbba..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf b/scripts/tune/env.fake-cortexa55.armv7vethf
deleted file mode 100644
index b832c81b36..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf-neon b/scripts/tune/env.fake-cortexa55.armv7vethf-neon
deleted file mode 100644
index b03cd3783a..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vethf-neon-vfpv4
deleted file mode 100644
index 89741e8f82..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3
deleted file mode 100644
index 2808933151..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3d16
deleted file mode 100644
index aa60c5856c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv4d16
deleted file mode 100644
index db27f2902f..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb b/scripts/tune/env.fake-cortexa55.armv7vethfb
deleted file mode 100644
index af52884874..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb-neon b/scripts/tune/env.fake-cortexa55.armv7vethfb-neon
deleted file mode 100644
index e99e791938..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa55.armv7vethfb-neon-vfpv4
deleted file mode 100644
index cd224aa14e..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3
deleted file mode 100644
index ee6f0fba72..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3d16
deleted file mode 100644
index 7bebd532f7..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv4d16
deleted file mode 100644
index 9416e1fccf..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8-2a b/scripts/tune/env.fake-cortexa55.armv8-2a
deleted file mode 100644
index bdbfb8a303..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8-2a-crypto b/scripts/tune/env.fake-cortexa55.armv8-2a-crypto
deleted file mode 100644
index 3fd0a24835..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8a b/scripts/tune/env.fake-cortexa55.armv8a
deleted file mode 100644
index ce1206335c..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa55"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8a-crc b/scripts/tune/env.fake-cortexa55.armv8a-crc
deleted file mode 100644
index 7d972aaae4..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa55.armv8a-crc-crypto
deleted file mode 100644
index c8fa1be1f1..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.armv8a-crypto b/scripts/tune/env.fake-cortexa55.armv8a-crypto
deleted file mode 100644
index d0d7a3905b..0000000000
--- a/scripts/tune/env.fake-cortexa55.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa55.cortexa55 b/scripts/tune/env.fake-cortexa55.cortexa55
deleted file mode 100644
index 0080287a93..0000000000
--- a/scripts/tune/env.fake-cortexa55.cortexa55
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa55 fake_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a55 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa55"
-TUNE_PKGARCH="cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a55 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57 b/scripts/tune/env.fake-cortexa57
deleted file mode 100644
index 6899483069..0000000000
--- a/scripts/tune/env.fake-cortexa57
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa57 cortexa57-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa57 fake_cortexa57"
-TUNE_CCARGS=" -mcpu=cortex-a57 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa57"
-TUNE_PKGARCH="cortexa57"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53 b/scripts/tune/env.fake-cortexa57-cortexa53
index 418258bcdf..cdb067b473 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53
+++ b/scripts/tune/env.fake-cortexa57-cortexa53
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa57-cortexa53"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa57-cortexa53 fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a57.cortex-a53 -march=armv8-a+crc"
+PACKAGE_ARCHS="all any noarch aarch64 cortexa57-cortexa53 fake_cortexa57_cortexa53"
+TUNE_CCARGS=" -march=armv8-a -mtune=cortex-a57.cortex-a53"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa57-cortexa53"
-TUNE_PKGARCH="cortexa57-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a57.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa57-cortexa53"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a -mtune=cortex-a57.cortex-a53 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.aarch64 b/scripts/tune/env.fake-cortexa57-cortexa53.aarch64
index ad6ee0715f..5af03187e8 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.aarch64
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.aarch64
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa57_cortexa53"
-TUNE_CCARGS=""
+TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64"
TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
+export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be b/scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be
index 92ba1327bc..18f081d98a 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa57_cortexa53"
-TUNE_CCARGS=""
+TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 bigendian"
TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
+export CC="aarch64_be-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a
index 303d9bf4a1..d9cb2d0ee6 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -march=armv8-a"
+TUNE_CCARGS=" -march=armv8-a -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc
index 6a4c96fd5b..1a85bd31b7 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crc"
+TUNE_CCARGS=" -march=armv8-a+crc -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto
index b869bce840..c9ba262348 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -march=armv8-a+crc+crypto -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto
index 5aa5177eb2..72b319c35e 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crypto"
+TUNE_CCARGS=" -march=armv8-a+crypto -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa53 b/scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa53
index 8ad1a865fc..faea9d6a2e 100644
--- a/scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa53
+++ b/scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa53
@@ -1,7 +1,7 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa57-cortexa53 fake_cortexa57_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a57.cortex-a53 -march=armv8-a+crc"
+PACKAGE_ARCHS="all any noarch aarch64 cortexa57-cortexa53 fake_cortexa57_cortexa53"
+TUNE_CCARGS=" -march=armv8-a -mtune=cortex-a57.cortex-a53"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa57-cortexa53"
-TUNE_PKGARCH="cortexa57-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a57.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa57-cortexa53"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a -mtune=cortex-a57.cortex-a53 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.aarch64 b/scripts/tune/env.fake-cortexa57.aarch64
deleted file mode 100644
index d0100ddd0e..0000000000
--- a/scripts/tune/env.fake-cortexa57.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa57"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.aarch64_be b/scripts/tune/env.fake-cortexa57.aarch64_be
deleted file mode 100644
index f118ed911d..0000000000
--- a/scripts/tune/env.fake-cortexa57.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa57"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv4 b/scripts/tune/env.fake-cortexa57.armv4
deleted file mode 100644
index ba8232bf68..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv4b b/scripts/tune/env.fake-cortexa57.armv4b
deleted file mode 100644
index c1f2c90db3..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa57"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv4t b/scripts/tune/env.fake-cortexa57.armv4t
deleted file mode 100644
index 58c7437e27..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa57"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv4tb b/scripts/tune/env.fake-cortexa57.armv4tb
deleted file mode 100644
index 1c6c461b97..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa57"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5 b/scripts/tune/env.fake-cortexa57.armv5
deleted file mode 100644
index 6cc9697b77..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5-vfp b/scripts/tune/env.fake-cortexa57.armv5-vfp
deleted file mode 100644
index 7bd76c4515..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5b b/scripts/tune/env.fake-cortexa57.armv5b
deleted file mode 100644
index 044db53df1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5b-vfp b/scripts/tune/env.fake-cortexa57.armv5b-vfp
deleted file mode 100644
index d5886ecba2..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5e b/scripts/tune/env.fake-cortexa57.armv5e
deleted file mode 100644
index 20665dc1dc..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5e-vfp b/scripts/tune/env.fake-cortexa57.armv5e-vfp
deleted file mode 100644
index 1cb2c17f0b..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5eb b/scripts/tune/env.fake-cortexa57.armv5eb
deleted file mode 100644
index 39f3ccccff..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5eb-vfp b/scripts/tune/env.fake-cortexa57.armv5eb-vfp
deleted file mode 100644
index 7279398bd1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5ehf-vfp b/scripts/tune/env.fake-cortexa57.armv5ehf-vfp
deleted file mode 100644
index 7815766e25..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa57.armv5ehfb-vfp
deleted file mode 100644
index 6cb6fc152f..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5hf-vfp b/scripts/tune/env.fake-cortexa57.armv5hf-vfp
deleted file mode 100644
index 30ed23d637..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5hfb-vfp b/scripts/tune/env.fake-cortexa57.armv5hfb-vfp
deleted file mode 100644
index c35f963b5e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5t b/scripts/tune/env.fake-cortexa57.armv5t
deleted file mode 100644
index 52d675e8c5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5t-vfp b/scripts/tune/env.fake-cortexa57.armv5t-vfp
deleted file mode 100644
index 9a42a970e1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5tb b/scripts/tune/env.fake-cortexa57.armv5tb
deleted file mode 100644
index 60be5a5644..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5tb-vfp b/scripts/tune/env.fake-cortexa57.armv5tb-vfp
deleted file mode 100644
index 11b7a623b8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5te b/scripts/tune/env.fake-cortexa57.armv5te
deleted file mode 100644
index 5f71c145d1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5te-vfp b/scripts/tune/env.fake-cortexa57.armv5te-vfp
deleted file mode 100644
index 373e74545c..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5teb b/scripts/tune/env.fake-cortexa57.armv5teb
deleted file mode 100644
index b9b22f3c47..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5teb-vfp b/scripts/tune/env.fake-cortexa57.armv5teb-vfp
deleted file mode 100644
index 84b84fa7f1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5tehf-vfp b/scripts/tune/env.fake-cortexa57.armv5tehf-vfp
deleted file mode 100644
index d90b66c9f9..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa57.armv5tehfb-vfp
deleted file mode 100644
index 0f6d1009bc..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5thf-vfp b/scripts/tune/env.fake-cortexa57.armv5thf-vfp
deleted file mode 100644
index ecd005dfb5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv5thfb-vfp b/scripts/tune/env.fake-cortexa57.armv5thfb-vfp
deleted file mode 100644
index 86b33ecd53..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6 b/scripts/tune/env.fake-cortexa57.armv6
deleted file mode 100644
index f403e9aa73..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6-novfp b/scripts/tune/env.fake-cortexa57.armv6-novfp
deleted file mode 100644
index 7298ede220..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa57"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6b b/scripts/tune/env.fake-cortexa57.armv6b
deleted file mode 100644
index f9850e2ce3..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6b-novfp b/scripts/tune/env.fake-cortexa57.armv6b-novfp
deleted file mode 100644
index 82a2415fd4..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa57"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6hf b/scripts/tune/env.fake-cortexa57.armv6hf
deleted file mode 100644
index b0f64e9b4b..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6hfb b/scripts/tune/env.fake-cortexa57.armv6hfb
deleted file mode 100644
index d1be0fd7c7..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6t b/scripts/tune/env.fake-cortexa57.armv6t
deleted file mode 100644
index b31347548a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6t-novfp b/scripts/tune/env.fake-cortexa57.armv6t-novfp
deleted file mode 100644
index 5d87fa9e73..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6tb b/scripts/tune/env.fake-cortexa57.armv6tb
deleted file mode 100644
index 9584c893c1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6tb-novfp b/scripts/tune/env.fake-cortexa57.armv6tb-novfp
deleted file mode 100644
index 0e8ce45f90..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6thf b/scripts/tune/env.fake-cortexa57.armv6thf
deleted file mode 100644
index 1828c81333..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv6thfb b/scripts/tune/env.fake-cortexa57.armv6thfb
deleted file mode 100644
index d76067b12e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a b/scripts/tune/env.fake-cortexa57.armv7a
deleted file mode 100644
index 777e55b073..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a-neon b/scripts/tune/env.fake-cortexa57.armv7a-neon
deleted file mode 100644
index 197ce5885e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7a-neon-vfpv4
deleted file mode 100644
index 5bb8979bb6..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7a-vfpv3
deleted file mode 100644
index 9d4f093fae..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7a-vfpv3d16
deleted file mode 100644
index 1517cac227..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7a-vfpv4d16
deleted file mode 100644
index 0cd4fc478a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab b/scripts/tune/env.fake-cortexa57.armv7ab
deleted file mode 100644
index dcc1ed50ba..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab-neon b/scripts/tune/env.fake-cortexa57.armv7ab-neon
deleted file mode 100644
index b87de4a61b..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7ab-neon-vfpv4
deleted file mode 100644
index bb9af5d3fc..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3
deleted file mode 100644
index d0a5f0b263..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3d16
deleted file mode 100644
index e2dc1ace52..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7ab-vfpv4d16
deleted file mode 100644
index 90a76d67dd..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf b/scripts/tune/env.fake-cortexa57.armv7ahf
deleted file mode 100644
index 9b363da21e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf-neon b/scripts/tune/env.fake-cortexa57.armv7ahf-neon
deleted file mode 100644
index 5269a40d9a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7ahf-neon-vfpv4
deleted file mode 100644
index c214536c88..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3
deleted file mode 100644
index 9dfc88984a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3d16
deleted file mode 100644
index 7ccac622da..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv4d16
deleted file mode 100644
index 9283049d58..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb b/scripts/tune/env.fake-cortexa57.armv7ahfb
deleted file mode 100644
index 48745f81c7..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb-neon b/scripts/tune/env.fake-cortexa57.armv7ahfb-neon
deleted file mode 100644
index 02c10b6771..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7ahfb-neon-vfpv4
deleted file mode 100644
index ba46bbb54d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3
deleted file mode 100644
index 3f8e1661a8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3d16
deleted file mode 100644
index f477f62161..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv4d16
deleted file mode 100644
index 98cd15f7e9..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at b/scripts/tune/env.fake-cortexa57.armv7at
deleted file mode 100644
index 5fe9f683f5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at-neon b/scripts/tune/env.fake-cortexa57.armv7at-neon
deleted file mode 100644
index 7bb505d427..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7at-neon-vfpv4
deleted file mode 100644
index 49b2c9acf8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7at-vfpv3
deleted file mode 100644
index a30e895714..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7at-vfpv3d16
deleted file mode 100644
index 7623e3e678..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7at-vfpv4d16
deleted file mode 100644
index e47cab2c6d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb b/scripts/tune/env.fake-cortexa57.armv7atb
deleted file mode 100644
index 4a5db089e6..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb-neon b/scripts/tune/env.fake-cortexa57.armv7atb-neon
deleted file mode 100644
index 6fa0342516..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7atb-neon-vfpv4
deleted file mode 100644
index 1ffe098d03..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3
deleted file mode 100644
index 630c12b09d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3d16
deleted file mode 100644
index 363d616350..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7atb-vfpv4d16
deleted file mode 100644
index d94ef18255..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf b/scripts/tune/env.fake-cortexa57.armv7athf
deleted file mode 100644
index 136b713fc1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf-neon b/scripts/tune/env.fake-cortexa57.armv7athf-neon
deleted file mode 100644
index 24ed684450..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7athf-neon-vfpv4
deleted file mode 100644
index d9010af030..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3
deleted file mode 100644
index be818f8399..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3d16
deleted file mode 100644
index dc4b390af2..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7athf-vfpv4d16
deleted file mode 100644
index 283d864be7..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb b/scripts/tune/env.fake-cortexa57.armv7athfb
deleted file mode 100644
index 1afa9824e6..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb-neon b/scripts/tune/env.fake-cortexa57.armv7athfb-neon
deleted file mode 100644
index 5e5b7eff59..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7athfb-neon-vfpv4
deleted file mode 100644
index c2cd7f1232..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3
deleted file mode 100644
index e134660377..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3d16
deleted file mode 100644
index 6f7ba9c61b..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv4d16
deleted file mode 100644
index 1686c79656..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve b/scripts/tune/env.fake-cortexa57.armv7ve
deleted file mode 100644
index 6f7a82f9ed..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve-neon b/scripts/tune/env.fake-cortexa57.armv7ve-neon
deleted file mode 100644
index b69b4bfe5a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7ve-neon-vfpv4
deleted file mode 100644
index 511f42c1b5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3
deleted file mode 100644
index 95d908ffcc..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3d16
deleted file mode 100644
index f860372640..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7ve-vfpv4d16
deleted file mode 100644
index d66e9ab83d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb b/scripts/tune/env.fake-cortexa57.armv7veb
deleted file mode 100644
index 636343e226..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb-neon b/scripts/tune/env.fake-cortexa57.armv7veb-neon
deleted file mode 100644
index 91a7203de5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7veb-neon-vfpv4
deleted file mode 100644
index d540920108..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3
deleted file mode 100644
index 0d5099c7eb..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3d16
deleted file mode 100644
index 37ba66686b..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7veb-vfpv4d16
deleted file mode 100644
index e441787d13..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf b/scripts/tune/env.fake-cortexa57.armv7vehf
deleted file mode 100644
index b65debfaf7..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf-neon b/scripts/tune/env.fake-cortexa57.armv7vehf-neon
deleted file mode 100644
index 96c6ba8074..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vehf-neon-vfpv4
deleted file mode 100644
index 2a0cd6d1c6..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3
deleted file mode 100644
index 84329698a2..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3d16
deleted file mode 100644
index 81c37b6a82..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv4d16
deleted file mode 100644
index 514923f93d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb b/scripts/tune/env.fake-cortexa57.armv7vehfb
deleted file mode 100644
index 560addc32d..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb-neon b/scripts/tune/env.fake-cortexa57.armv7vehfb-neon
deleted file mode 100644
index 92bbff7e49..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 17180a1751..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3
deleted file mode 100644
index 95b63006e2..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3d16
deleted file mode 100644
index 767333cf8e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv4d16
deleted file mode 100644
index aecc616a20..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet b/scripts/tune/env.fake-cortexa57.armv7vet
deleted file mode 100644
index d125dc2bc1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet-neon b/scripts/tune/env.fake-cortexa57.armv7vet-neon
deleted file mode 100644
index 9010d0924a..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vet-neon-vfpv4
deleted file mode 100644
index 34eb85c322..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3
deleted file mode 100644
index 06da0e15b8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3d16
deleted file mode 100644
index 3bb9d8f48e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vet-vfpv4d16
deleted file mode 100644
index d3ca465865..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb b/scripts/tune/env.fake-cortexa57.armv7vetb
deleted file mode 100644
index 51864d61b5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb-neon b/scripts/tune/env.fake-cortexa57.armv7vetb-neon
deleted file mode 100644
index 7beb748ca0..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vetb-neon-vfpv4
deleted file mode 100644
index 688c5d3bd8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3
deleted file mode 100644
index 6d438b5324..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3d16
deleted file mode 100644
index a8f3495ca0..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv4d16
deleted file mode 100644
index 4d3367b449..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf b/scripts/tune/env.fake-cortexa57.armv7vethf
deleted file mode 100644
index 9f242987a8..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf-neon b/scripts/tune/env.fake-cortexa57.armv7vethf-neon
deleted file mode 100644
index c497124898..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vethf-neon-vfpv4
deleted file mode 100644
index e023058668..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3
deleted file mode 100644
index a44016b2e7..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3d16
deleted file mode 100644
index 3e0821f0f5..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv4d16
deleted file mode 100644
index 290d3e7828..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb b/scripts/tune/env.fake-cortexa57.armv7vethfb
deleted file mode 100644
index fa4c205b3e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb-neon b/scripts/tune/env.fake-cortexa57.armv7vethfb-neon
deleted file mode 100644
index 5d451019ef..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa57.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 7cc5022eb1..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3
deleted file mode 100644
index 4c604ae7f2..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3d16
deleted file mode 100644
index 8eb0a2e8b9..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv4d16
deleted file mode 100644
index 8148630e7e..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa57"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv8a b/scripts/tune/env.fake-cortexa57.armv8a
deleted file mode 100644
index 5b72ce3559..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa57"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv8a-crc b/scripts/tune/env.fake-cortexa57.armv8a-crc
deleted file mode 100644
index 8b66b14cf3..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa57"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa57.armv8a-crc-crypto
deleted file mode 100644
index 1767ba0771..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa57"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.armv8a-crypto b/scripts/tune/env.fake-cortexa57.armv8a-crypto
deleted file mode 100644
index 0da4e9bdec..0000000000
--- a/scripts/tune/env.fake-cortexa57.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa57"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.cortexa57 b/scripts/tune/env.fake-cortexa57.cortexa57
deleted file mode 100644
index ed4f3692a2..0000000000
--- a/scripts/tune/env.fake-cortexa57.cortexa57
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa57 fake_cortexa57"
-TUNE_CCARGS=" -mcpu=cortex-a57 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa57"
-TUNE_PKGARCH="cortexa57"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa57.cortexa57-crypto b/scripts/tune/env.fake-cortexa57.cortexa57-crypto
deleted file mode 100644
index 606f434945..0000000000
--- a/scripts/tune/env.fake-cortexa57.cortexa57-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa57 cortexa57-crypto fake_cortexa57"
-TUNE_CCARGS=" -mcpu=cortex-a57 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa57 crypto"
-TUNE_PKGARCH="cortexa57-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65 b/scripts/tune/env.fake-cortexa65
deleted file mode 100644
index 7bc8dc9ea9..0000000000
--- a/scripts/tune/env.fake-cortexa65
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa65"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa65 fake_cortexa65"
-TUNE_CCARGS=" -mcpu=cortex-a65 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa65"
-TUNE_PKGARCH="cortexa65"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a65 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.aarch64 b/scripts/tune/env.fake-cortexa65.aarch64
deleted file mode 100644
index 641deb14ca..0000000000
--- a/scripts/tune/env.fake-cortexa65.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa65"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.aarch64_be b/scripts/tune/env.fake-cortexa65.aarch64_be
deleted file mode 100644
index 5aa321356c..0000000000
--- a/scripts/tune/env.fake-cortexa65.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa65"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv4 b/scripts/tune/env.fake-cortexa65.armv4
deleted file mode 100644
index 6dec49666a..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv4b b/scripts/tune/env.fake-cortexa65.armv4b
deleted file mode 100644
index 8262d7e59e..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa65"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv4t b/scripts/tune/env.fake-cortexa65.armv4t
deleted file mode 100644
index 157435622e..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa65"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv4tb b/scripts/tune/env.fake-cortexa65.armv4tb
deleted file mode 100644
index b77f949f79..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa65"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5 b/scripts/tune/env.fake-cortexa65.armv5
deleted file mode 100644
index dbf21c3f7e..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5-vfp b/scripts/tune/env.fake-cortexa65.armv5-vfp
deleted file mode 100644
index 072db27f83..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5b b/scripts/tune/env.fake-cortexa65.armv5b
deleted file mode 100644
index 62fa7398a3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5b-vfp b/scripts/tune/env.fake-cortexa65.armv5b-vfp
deleted file mode 100644
index 700b58fcb3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5e b/scripts/tune/env.fake-cortexa65.armv5e
deleted file mode 100644
index 9d4e8655fb..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5e-vfp b/scripts/tune/env.fake-cortexa65.armv5e-vfp
deleted file mode 100644
index b496873c2f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5eb b/scripts/tune/env.fake-cortexa65.armv5eb
deleted file mode 100644
index 103476718a..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5eb-vfp b/scripts/tune/env.fake-cortexa65.armv5eb-vfp
deleted file mode 100644
index d53114f57f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5ehf-vfp b/scripts/tune/env.fake-cortexa65.armv5ehf-vfp
deleted file mode 100644
index d22d23397f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa65.armv5ehfb-vfp
deleted file mode 100644
index 39b80710c4..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5hf-vfp b/scripts/tune/env.fake-cortexa65.armv5hf-vfp
deleted file mode 100644
index 73b3475d69..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5hfb-vfp b/scripts/tune/env.fake-cortexa65.armv5hfb-vfp
deleted file mode 100644
index 5e7a86c20f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5t b/scripts/tune/env.fake-cortexa65.armv5t
deleted file mode 100644
index 538a5d4b44..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5t-vfp b/scripts/tune/env.fake-cortexa65.armv5t-vfp
deleted file mode 100644
index 3a6817554b..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5tb b/scripts/tune/env.fake-cortexa65.armv5tb
deleted file mode 100644
index ddb4ff9388..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5tb-vfp b/scripts/tune/env.fake-cortexa65.armv5tb-vfp
deleted file mode 100644
index 936f421134..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5te b/scripts/tune/env.fake-cortexa65.armv5te
deleted file mode 100644
index 8f8de12652..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5te-vfp b/scripts/tune/env.fake-cortexa65.armv5te-vfp
deleted file mode 100644
index 8d0038dd65..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5teb b/scripts/tune/env.fake-cortexa65.armv5teb
deleted file mode 100644
index bd78f9a92d..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5teb-vfp b/scripts/tune/env.fake-cortexa65.armv5teb-vfp
deleted file mode 100644
index d091042381..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5tehf-vfp b/scripts/tune/env.fake-cortexa65.armv5tehf-vfp
deleted file mode 100644
index c9904220e4..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa65.armv5tehfb-vfp
deleted file mode 100644
index 06704d9285..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5thf-vfp b/scripts/tune/env.fake-cortexa65.armv5thf-vfp
deleted file mode 100644
index 43aae6765c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv5thfb-vfp b/scripts/tune/env.fake-cortexa65.armv5thfb-vfp
deleted file mode 100644
index cc61d7fc19..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6 b/scripts/tune/env.fake-cortexa65.armv6
deleted file mode 100644
index 4752dd1cf4..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6-novfp b/scripts/tune/env.fake-cortexa65.armv6-novfp
deleted file mode 100644
index 0d3d177d8c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa65"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6b b/scripts/tune/env.fake-cortexa65.armv6b
deleted file mode 100644
index 7fc6f664e3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6b-novfp b/scripts/tune/env.fake-cortexa65.armv6b-novfp
deleted file mode 100644
index 43aeace311..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa65"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6hf b/scripts/tune/env.fake-cortexa65.armv6hf
deleted file mode 100644
index 8d34f0b1ff..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6hfb b/scripts/tune/env.fake-cortexa65.armv6hfb
deleted file mode 100644
index 5e6ae7356d..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6t b/scripts/tune/env.fake-cortexa65.armv6t
deleted file mode 100644
index 7febb3bb12..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6t-novfp b/scripts/tune/env.fake-cortexa65.armv6t-novfp
deleted file mode 100644
index 7024a98860..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6tb b/scripts/tune/env.fake-cortexa65.armv6tb
deleted file mode 100644
index 5015d5ce36..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6tb-novfp b/scripts/tune/env.fake-cortexa65.armv6tb-novfp
deleted file mode 100644
index feba7b6c78..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6thf b/scripts/tune/env.fake-cortexa65.armv6thf
deleted file mode 100644
index 30ec0c9457..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv6thfb b/scripts/tune/env.fake-cortexa65.armv6thfb
deleted file mode 100644
index ad685564f6..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a b/scripts/tune/env.fake-cortexa65.armv7a
deleted file mode 100644
index a8b4f89132..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a-neon b/scripts/tune/env.fake-cortexa65.armv7a-neon
deleted file mode 100644
index c2e5458ea5..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7a-neon-vfpv4
deleted file mode 100644
index 60bdb3c874..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7a-vfpv3
deleted file mode 100644
index 894f754008..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7a-vfpv3d16
deleted file mode 100644
index 3daeeb7653..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7a-vfpv4d16
deleted file mode 100644
index d2323f0bf2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab b/scripts/tune/env.fake-cortexa65.armv7ab
deleted file mode 100644
index fbb09c8587..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab-neon b/scripts/tune/env.fake-cortexa65.armv7ab-neon
deleted file mode 100644
index 0a913eedbb..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7ab-neon-vfpv4
deleted file mode 100644
index 5bb2bade1f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3
deleted file mode 100644
index 1b92282e79..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3d16
deleted file mode 100644
index c2d59d2023..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7ab-vfpv4d16
deleted file mode 100644
index 4ad7f4679c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf b/scripts/tune/env.fake-cortexa65.armv7ahf
deleted file mode 100644
index cfafcc6128..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf-neon b/scripts/tune/env.fake-cortexa65.armv7ahf-neon
deleted file mode 100644
index 6c7d72ebd2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7ahf-neon-vfpv4
deleted file mode 100644
index 8636a17b4d..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3
deleted file mode 100644
index 1478a283ac..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3d16
deleted file mode 100644
index 90e6487498..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv4d16
deleted file mode 100644
index 9718c7df03..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb b/scripts/tune/env.fake-cortexa65.armv7ahfb
deleted file mode 100644
index 12923755b4..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb-neon b/scripts/tune/env.fake-cortexa65.armv7ahfb-neon
deleted file mode 100644
index a80c58041c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 0c6ffa0567..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3
deleted file mode 100644
index 759a15da92..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3d16
deleted file mode 100644
index cc9b8f6ff7..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv4d16
deleted file mode 100644
index 00263f15c2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at b/scripts/tune/env.fake-cortexa65.armv7at
deleted file mode 100644
index a1a846e3c3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at-neon b/scripts/tune/env.fake-cortexa65.armv7at-neon
deleted file mode 100644
index 518b4fe9c4..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7at-neon-vfpv4
deleted file mode 100644
index 546b5d016f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7at-vfpv3
deleted file mode 100644
index ab0b8790d6..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7at-vfpv3d16
deleted file mode 100644
index baef6fd00c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7at-vfpv4d16
deleted file mode 100644
index 995595951b..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb b/scripts/tune/env.fake-cortexa65.armv7atb
deleted file mode 100644
index 82f7953102..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb-neon b/scripts/tune/env.fake-cortexa65.armv7atb-neon
deleted file mode 100644
index 68f738e0c2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7atb-neon-vfpv4
deleted file mode 100644
index a4daadde63..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3
deleted file mode 100644
index 48bc3ddca8..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3d16
deleted file mode 100644
index 90d1bdbb47..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7atb-vfpv4d16
deleted file mode 100644
index c70c35f537..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf b/scripts/tune/env.fake-cortexa65.armv7athf
deleted file mode 100644
index 4c4b34df5c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf-neon b/scripts/tune/env.fake-cortexa65.armv7athf-neon
deleted file mode 100644
index db74aa0f80..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7athf-neon-vfpv4
deleted file mode 100644
index b9823e410c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3
deleted file mode 100644
index 036b98aafd..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3d16
deleted file mode 100644
index fe46ebd230..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7athf-vfpv4d16
deleted file mode 100644
index a97df44a9c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb b/scripts/tune/env.fake-cortexa65.armv7athfb
deleted file mode 100644
index d1b6810f2b..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb-neon b/scripts/tune/env.fake-cortexa65.armv7athfb-neon
deleted file mode 100644
index 5e8c2a0716..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7athfb-neon-vfpv4
deleted file mode 100644
index d3ac7a3ebd..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3
deleted file mode 100644
index 2c89f63d28..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3d16
deleted file mode 100644
index 754af2080f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv4d16
deleted file mode 100644
index de83ed54bf..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve b/scripts/tune/env.fake-cortexa65.armv7ve
deleted file mode 100644
index 298b5dcd02..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve-neon b/scripts/tune/env.fake-cortexa65.armv7ve-neon
deleted file mode 100644
index 6303577cc3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7ve-neon-vfpv4
deleted file mode 100644
index c25b00d1a2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3
deleted file mode 100644
index f731613631..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3d16
deleted file mode 100644
index d5cd9ec780..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7ve-vfpv4d16
deleted file mode 100644
index c264872014..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb b/scripts/tune/env.fake-cortexa65.armv7veb
deleted file mode 100644
index cb488ecdc3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb-neon b/scripts/tune/env.fake-cortexa65.armv7veb-neon
deleted file mode 100644
index 5cc409b177..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7veb-neon-vfpv4
deleted file mode 100644
index e0009e1032..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3
deleted file mode 100644
index fc5b6c9f9c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3d16
deleted file mode 100644
index 5697967ca2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7veb-vfpv4d16
deleted file mode 100644
index 626639203f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf b/scripts/tune/env.fake-cortexa65.armv7vehf
deleted file mode 100644
index c8d707fa7d..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf-neon b/scripts/tune/env.fake-cortexa65.armv7vehf-neon
deleted file mode 100644
index 745082569a..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vehf-neon-vfpv4
deleted file mode 100644
index 4e66a03f48..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3
deleted file mode 100644
index e19ba7632e..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3d16
deleted file mode 100644
index ab0fd81801..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv4d16
deleted file mode 100644
index f919dbc6f7..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb b/scripts/tune/env.fake-cortexa65.armv7vehfb
deleted file mode 100644
index 05e045beb2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb-neon b/scripts/tune/env.fake-cortexa65.armv7vehfb-neon
deleted file mode 100644
index 82ef9d7922..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 8e6565d189..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3
deleted file mode 100644
index 17e8062517..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3d16
deleted file mode 100644
index 9f7e9e6178..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv4d16
deleted file mode 100644
index c55d86e04c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet b/scripts/tune/env.fake-cortexa65.armv7vet
deleted file mode 100644
index 38b360f54c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet-neon b/scripts/tune/env.fake-cortexa65.armv7vet-neon
deleted file mode 100644
index 8c420bfee5..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vet-neon-vfpv4
deleted file mode 100644
index ddfb39fb58..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3
deleted file mode 100644
index 67e0f61be8..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3d16
deleted file mode 100644
index a91e631e24..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vet-vfpv4d16
deleted file mode 100644
index fe3704393e..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb b/scripts/tune/env.fake-cortexa65.armv7vetb
deleted file mode 100644
index 2c24a22c26..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb-neon b/scripts/tune/env.fake-cortexa65.armv7vetb-neon
deleted file mode 100644
index 1e578d21ca..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vetb-neon-vfpv4
deleted file mode 100644
index 202cc7aad3..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3
deleted file mode 100644
index 6e37b9c604..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3d16
deleted file mode 100644
index 0d709f3fe1..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv4d16
deleted file mode 100644
index d9edc80e3c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf b/scripts/tune/env.fake-cortexa65.armv7vethf
deleted file mode 100644
index a82456467a..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf-neon b/scripts/tune/env.fake-cortexa65.armv7vethf-neon
deleted file mode 100644
index 20000abbd2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vethf-neon-vfpv4
deleted file mode 100644
index e157be3709..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3
deleted file mode 100644
index 35137b354c..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3d16
deleted file mode 100644
index c155f1eb54..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv4d16
deleted file mode 100644
index bba595718a..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb b/scripts/tune/env.fake-cortexa65.armv7vethfb
deleted file mode 100644
index 1bdd66f72d..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb-neon b/scripts/tune/env.fake-cortexa65.armv7vethfb-neon
deleted file mode 100644
index 02cb83c282..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65.armv7vethfb-neon-vfpv4
deleted file mode 100644
index fd54176214..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3
deleted file mode 100644
index db43125ec5..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3d16
deleted file mode 100644
index 93fb812f86..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv4d16
deleted file mode 100644
index aecbd42bcd..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa65"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8-2a b/scripts/tune/env.fake-cortexa65.armv8-2a
deleted file mode 100644
index fd0b488347..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa65"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8-2a-crypto b/scripts/tune/env.fake-cortexa65.armv8-2a-crypto
deleted file mode 100644
index 0f072c7783..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa65"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8a b/scripts/tune/env.fake-cortexa65.armv8a
deleted file mode 100644
index 37b19e997f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa65"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8a-crc b/scripts/tune/env.fake-cortexa65.armv8a-crc
deleted file mode 100644
index 90d27fe1c2..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa65"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa65.armv8a-crc-crypto
deleted file mode 100644
index 4e074a7f5f..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa65"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.armv8a-crypto b/scripts/tune/env.fake-cortexa65.armv8a-crypto
deleted file mode 100644
index 269654af21..0000000000
--- a/scripts/tune/env.fake-cortexa65.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa65"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65.cortexa65 b/scripts/tune/env.fake-cortexa65.cortexa65
deleted file mode 100644
index 94f1ba0973..0000000000
--- a/scripts/tune/env.fake-cortexa65.cortexa65
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa65 fake_cortexa65"
-TUNE_CCARGS=" -mcpu=cortex-a65 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa65"
-TUNE_PKGARCH="cortexa65"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a65 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae b/scripts/tune/env.fake-cortexa65ae
deleted file mode 100644
index 0f32818d3a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa65ae"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa65ae fake_cortexa65ae"
-TUNE_CCARGS=" -mcpu=cortex-a65ae -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa65ae"
-TUNE_PKGARCH="cortexa65ae"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a65ae -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.aarch64 b/scripts/tune/env.fake-cortexa65ae.aarch64
deleted file mode 100644
index ed05013b42..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa65ae"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.aarch64_be b/scripts/tune/env.fake-cortexa65ae.aarch64_be
deleted file mode 100644
index 38517bb64c..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa65ae"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv4 b/scripts/tune/env.fake-cortexa65ae.armv4
deleted file mode 100644
index 43d1afdacc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv4b b/scripts/tune/env.fake-cortexa65ae.armv4b
deleted file mode 100644
index ab88b516dd..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv4t b/scripts/tune/env.fake-cortexa65ae.armv4t
deleted file mode 100644
index 10552757a6..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv4tb b/scripts/tune/env.fake-cortexa65ae.armv4tb
deleted file mode 100644
index 244bab1816..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5 b/scripts/tune/env.fake-cortexa65ae.armv5
deleted file mode 100644
index 2d3b878626..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5-vfp b/scripts/tune/env.fake-cortexa65ae.armv5-vfp
deleted file mode 100644
index edda0c7e99..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5b b/scripts/tune/env.fake-cortexa65ae.armv5b
deleted file mode 100644
index adac9277b7..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5b-vfp b/scripts/tune/env.fake-cortexa65ae.armv5b-vfp
deleted file mode 100644
index ab88ec4284..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5e b/scripts/tune/env.fake-cortexa65ae.armv5e
deleted file mode 100644
index 647e9c6b6a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5e-vfp b/scripts/tune/env.fake-cortexa65ae.armv5e-vfp
deleted file mode 100644
index f8435acb93..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5eb b/scripts/tune/env.fake-cortexa65ae.armv5eb
deleted file mode 100644
index 3fb7e1890a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5eb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5eb-vfp
deleted file mode 100644
index e2f8e7e703..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5ehf-vfp b/scripts/tune/env.fake-cortexa65ae.armv5ehf-vfp
deleted file mode 100644
index f6ac55a7d1..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5ehfb-vfp
deleted file mode 100644
index 307150c701..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5hf-vfp b/scripts/tune/env.fake-cortexa65ae.armv5hf-vfp
deleted file mode 100644
index cbe54616e9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5hfb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5hfb-vfp
deleted file mode 100644
index bc5bf7f7e5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5t b/scripts/tune/env.fake-cortexa65ae.armv5t
deleted file mode 100644
index e16d58d22f..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5t-vfp b/scripts/tune/env.fake-cortexa65ae.armv5t-vfp
deleted file mode 100644
index c4a26329d3..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5tb b/scripts/tune/env.fake-cortexa65ae.armv5tb
deleted file mode 100644
index 9d8440e996..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5tb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5tb-vfp
deleted file mode 100644
index 9e78172ccc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5te b/scripts/tune/env.fake-cortexa65ae.armv5te
deleted file mode 100644
index f7618cd0ec..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5te-vfp b/scripts/tune/env.fake-cortexa65ae.armv5te-vfp
deleted file mode 100644
index 2c64840d7f..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5teb b/scripts/tune/env.fake-cortexa65ae.armv5teb
deleted file mode 100644
index d89b355134..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5teb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5teb-vfp
deleted file mode 100644
index 5a413b7826..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5tehf-vfp b/scripts/tune/env.fake-cortexa65ae.armv5tehf-vfp
deleted file mode 100644
index 9cedf5bb1c..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5tehfb-vfp
deleted file mode 100644
index ba958b1335..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5thf-vfp b/scripts/tune/env.fake-cortexa65ae.armv5thf-vfp
deleted file mode 100644
index 95b5d627ef..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv5thfb-vfp b/scripts/tune/env.fake-cortexa65ae.armv5thfb-vfp
deleted file mode 100644
index 8244044162..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6 b/scripts/tune/env.fake-cortexa65ae.armv6
deleted file mode 100644
index 5fb00c85ee..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6-novfp b/scripts/tune/env.fake-cortexa65ae.armv6-novfp
deleted file mode 100644
index f7e6c75d6e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6b b/scripts/tune/env.fake-cortexa65ae.armv6b
deleted file mode 100644
index ca484f24aa..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6b-novfp b/scripts/tune/env.fake-cortexa65ae.armv6b-novfp
deleted file mode 100644
index dc6d0ca76f..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6hf b/scripts/tune/env.fake-cortexa65ae.armv6hf
deleted file mode 100644
index 8cd9a166e7..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6hfb b/scripts/tune/env.fake-cortexa65ae.armv6hfb
deleted file mode 100644
index a4d0b9cbe9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6t b/scripts/tune/env.fake-cortexa65ae.armv6t
deleted file mode 100644
index 6eedfff56e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6t-novfp b/scripts/tune/env.fake-cortexa65ae.armv6t-novfp
deleted file mode 100644
index 38e76af412..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6tb b/scripts/tune/env.fake-cortexa65ae.armv6tb
deleted file mode 100644
index 18cdefc0b9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6tb-novfp b/scripts/tune/env.fake-cortexa65ae.armv6tb-novfp
deleted file mode 100644
index c8ac07aa22..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6thf b/scripts/tune/env.fake-cortexa65ae.armv6thf
deleted file mode 100644
index 76d104fbad..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv6thfb b/scripts/tune/env.fake-cortexa65ae.armv6thfb
deleted file mode 100644
index 1aecff304b..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a b/scripts/tune/env.fake-cortexa65ae.armv7a
deleted file mode 100644
index 99ec2c16d9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a-neon b/scripts/tune/env.fake-cortexa65ae.armv7a-neon
deleted file mode 100644
index 0972d5319b..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7a-neon-vfpv4
deleted file mode 100644
index 6efeca1de5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3
deleted file mode 100644
index ac09aa990e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3d16
deleted file mode 100644
index 6cc2865187..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv4d16
deleted file mode 100644
index 6d47324cd9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab b/scripts/tune/env.fake-cortexa65ae.armv7ab
deleted file mode 100644
index da2e93215c..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab-neon b/scripts/tune/env.fake-cortexa65ae.armv7ab-neon
deleted file mode 100644
index 522c9706c5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7ab-neon-vfpv4
deleted file mode 100644
index a4cf4cddbe..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3
deleted file mode 100644
index fbc0141f65..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3d16
deleted file mode 100644
index 7e4b9117dc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv4d16
deleted file mode 100644
index 0e7f564ead..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf b/scripts/tune/env.fake-cortexa65ae.armv7ahf
deleted file mode 100644
index 2d1c70625e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon b/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon
deleted file mode 100644
index 8f03aa553b..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon-vfpv4
deleted file mode 100644
index cd6ee48520..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3
deleted file mode 100644
index b3c9318bc0..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3d16
deleted file mode 100644
index 1926bb81fb..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv4d16
deleted file mode 100644
index 760c0b0e93..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb b/scripts/tune/env.fake-cortexa65ae.armv7ahfb
deleted file mode 100644
index 705830197e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon b/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon
deleted file mode 100644
index 580ded24bd..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 87d3a735c5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3
deleted file mode 100644
index b7ea1cf2f2..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3d16
deleted file mode 100644
index 87ea8d95ce..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv4d16
deleted file mode 100644
index d21bba9ad9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at b/scripts/tune/env.fake-cortexa65ae.armv7at
deleted file mode 100644
index 0f910af924..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at-neon b/scripts/tune/env.fake-cortexa65ae.armv7at-neon
deleted file mode 100644
index 28146d4fa2..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7at-neon-vfpv4
deleted file mode 100644
index 5c48f72980..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3
deleted file mode 100644
index 0e10d0152f..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3d16
deleted file mode 100644
index 0a39615043..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv4d16
deleted file mode 100644
index 1b7409248d..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb b/scripts/tune/env.fake-cortexa65ae.armv7atb
deleted file mode 100644
index ddbf8438c2..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb-neon b/scripts/tune/env.fake-cortexa65ae.armv7atb-neon
deleted file mode 100644
index 7cff9de104..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7atb-neon-vfpv4
deleted file mode 100644
index b0143120a2..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3
deleted file mode 100644
index 58f89499d8..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3d16
deleted file mode 100644
index 634026a1ce..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv4d16
deleted file mode 100644
index d7f1f5783b..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf b/scripts/tune/env.fake-cortexa65ae.armv7athf
deleted file mode 100644
index b80ad7f9b9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf-neon b/scripts/tune/env.fake-cortexa65ae.armv7athf-neon
deleted file mode 100644
index dc2c88a500..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7athf-neon-vfpv4
deleted file mode 100644
index 14cd6aa930..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3
deleted file mode 100644
index c39ce6b4c3..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3d16
deleted file mode 100644
index b771f7fdea..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv4d16
deleted file mode 100644
index dbfa030513..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb b/scripts/tune/env.fake-cortexa65ae.armv7athfb
deleted file mode 100644
index 0c493db5b7..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon b/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon
deleted file mode 100644
index 67667562d6..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon-vfpv4
deleted file mode 100644
index ecf1ff3f6a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3
deleted file mode 100644
index 914dba2da7..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3d16
deleted file mode 100644
index 2f1d73fc36..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv4d16
deleted file mode 100644
index 1b59388993..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve b/scripts/tune/env.fake-cortexa65ae.armv7ve
deleted file mode 100644
index 08a5a93f20..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve-neon b/scripts/tune/env.fake-cortexa65ae.armv7ve-neon
deleted file mode 100644
index cfe45bfcb0..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7ve-neon-vfpv4
deleted file mode 100644
index 39cb974883..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3
deleted file mode 100644
index 66135fb4a1..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3d16
deleted file mode 100644
index 494c3bd637..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv4d16
deleted file mode 100644
index d7f39ff7eb..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb b/scripts/tune/env.fake-cortexa65ae.armv7veb
deleted file mode 100644
index a542e91e78..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb-neon b/scripts/tune/env.fake-cortexa65ae.armv7veb-neon
deleted file mode 100644
index 3d1fe71ca9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7veb-neon-vfpv4
deleted file mode 100644
index b0db36e0ed..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3
deleted file mode 100644
index 23b88c5c6a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3d16
deleted file mode 100644
index 8a979384ed..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv4d16
deleted file mode 100644
index 541ee951af..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf b/scripts/tune/env.fake-cortexa65ae.armv7vehf
deleted file mode 100644
index 8ba58891e3..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon b/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon
deleted file mode 100644
index 2de2b3cc44..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon-vfpv4
deleted file mode 100644
index 9fbd8288ca..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3
deleted file mode 100644
index 01a13cbcab..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3d16
deleted file mode 100644
index ecd21ab1c9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv4d16
deleted file mode 100644
index 6089dafbc3..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb b/scripts/tune/env.fake-cortexa65ae.armv7vehfb
deleted file mode 100644
index 4eb70406c9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon b/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon
deleted file mode 100644
index 7f98edd818..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon-vfpv4
deleted file mode 100644
index fc7bfa98ca..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3
deleted file mode 100644
index cb6bf468cc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3d16
deleted file mode 100644
index 232fc67904..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv4d16
deleted file mode 100644
index 0fef01758d..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet b/scripts/tune/env.fake-cortexa65ae.armv7vet
deleted file mode 100644
index 10777fac98..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet-neon b/scripts/tune/env.fake-cortexa65ae.armv7vet-neon
deleted file mode 100644
index 4be0c29a00..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vet-neon-vfpv4
deleted file mode 100644
index c2f276c3b0..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3
deleted file mode 100644
index 342e8a4e5f..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3d16
deleted file mode 100644
index 614c5135a3..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv4d16
deleted file mode 100644
index cd7507dac8..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb b/scripts/tune/env.fake-cortexa65ae.armv7vetb
deleted file mode 100644
index e24a545cce..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon b/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon
deleted file mode 100644
index a645e7576a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon-vfpv4
deleted file mode 100644
index 8f9c0f4ecb..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3
deleted file mode 100644
index 529f7a334d..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3d16
deleted file mode 100644
index 634a92de61..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv4d16
deleted file mode 100644
index ba828899fc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf b/scripts/tune/env.fake-cortexa65ae.armv7vethf
deleted file mode 100644
index 73d49bd02e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon b/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon
deleted file mode 100644
index 659f8482bc..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon-vfpv4
deleted file mode 100644
index 0e09ccf65e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3
deleted file mode 100644
index 8dceae60de..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3d16
deleted file mode 100644
index 06d389fc9a..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv4d16
deleted file mode 100644
index 629d705e23..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb b/scripts/tune/env.fake-cortexa65ae.armv7vethfb
deleted file mode 100644
index 4a492c6047..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon b/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon
deleted file mode 100644
index 2020462743..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 6b4105efdf..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3
deleted file mode 100644
index 5602278b5e..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3d16
deleted file mode 100644
index d2b9d4cbbf..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv4d16
deleted file mode 100644
index 68d2565fa5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8-2a b/scripts/tune/env.fake-cortexa65ae.armv8-2a
deleted file mode 100644
index 8632a75eeb..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8-2a-crypto b/scripts/tune/env.fake-cortexa65ae.armv8-2a-crypto
deleted file mode 100644
index 5787bedda6..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8a b/scripts/tune/env.fake-cortexa65ae.armv8a
deleted file mode 100644
index cdcd3d484c..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8a-crc b/scripts/tune/env.fake-cortexa65ae.armv8a-crc
deleted file mode 100644
index cdea29d472..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa65ae.armv8a-crc-crypto
deleted file mode 100644
index c44e13b8b5..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.armv8a-crypto b/scripts/tune/env.fake-cortexa65ae.armv8a-crypto
deleted file mode 100644
index dc7ee789d9..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa65ae"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa65ae.cortexa65ae b/scripts/tune/env.fake-cortexa65ae.cortexa65ae
deleted file mode 100644
index 03264fee67..0000000000
--- a/scripts/tune/env.fake-cortexa65ae.cortexa65ae
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa65ae fake_cortexa65ae"
-TUNE_CCARGS=" -mcpu=cortex-a65ae -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa65ae"
-TUNE_PKGARCH="cortexa65ae"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a65ae -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72 b/scripts/tune/env.fake-cortexa72
index cfa8d050d7..dc892c324e 100644
--- a/scripts/tune/env.fake-cortexa72
+++ b/scripts/tune/env.fake-cortexa72
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa72"
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa72 fake_cortexa72"
-TUNE_CCARGS=" -mcpu=cortex-a72 -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -mcpu=cortex-a72+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto cortexa72"
-TUNE_PKGARCH="cortexa72"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa72 crc crypto"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53 b/scripts/tune/env.fake-cortexa72-cortexa53
index b87e052473..2e245ecd87 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53
+++ b/scripts/tune/env.fake-cortexa72-cortexa53
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa72-cortexa53 cortexa72-cortexa53-crypto"
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa72-cortexa53 fake_cortexa72_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc"
+TUNE_CCARGS=" -march=armv8-a+crc -mtune=cortex-a72.cortex-a53"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc cortexa72-cortexa53"
-TUNE_PKGARCH="cortexa72-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crc -mtune=cortex-a72.cortex-a53 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a
index 6916783559..802fa5c13e 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc
index dd9e9b9aec..f59a027729 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto
index 69df971140..5cc672856d 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto
index 9274fe3779..2a222bb104 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53 b/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53
index efdf17c817..311fa3d5ba 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa72-cortexa53 fake_cortexa72_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc"
+TUNE_CCARGS=" -march=armv8-a+crc -mtune=cortex-a72.cortex-a53"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc cortexa72-cortexa53"
-TUNE_PKGARCH="cortexa72-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crc -mtune=cortex-a72.cortex-a53 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto b/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto
index d0206bd6b9..b3cf95329b 100644
--- a/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto
+++ b/scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa72-cortexa53 cortexa72-cortexa53-crypto fake_cortexa72_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -march=armv8-a+crc+crypto -mtune=cortex-a72.cortex-a53"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa72-cortexa53 crypto"
-TUNE_PKGARCH="cortexa72-cortexa53-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72.cortex-a53 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 armv8a crc crypto cortexa72-cortexa53"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto -mtune=cortex-a72.cortex-a53 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72.armv8a b/scripts/tune/env.fake-cortexa72.armv8a
index e085fa0762..0203eb2154 100644
--- a/scripts/tune/env.fake-cortexa72.armv8a
+++ b/scripts/tune/env.fake-cortexa72.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72.armv8a-crc b/scripts/tune/env.fake-cortexa72.armv8a-crc
index 82721883d0..87f3502d81 100644
--- a/scripts/tune/env.fake-cortexa72.armv8a-crc
+++ b/scripts/tune/env.fake-cortexa72.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa72.armv8a-crc-crypto
index 9fac502603..323778bb0b 100644
--- a/scripts/tune/env.fake-cortexa72.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-cortexa72.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72.armv8a-crypto b/scripts/tune/env.fake-cortexa72.armv8a-crypto
index b252b0eb10..3a6243551b 100644
--- a/scripts/tune/env.fake-cortexa72.armv8a-crypto
+++ b/scripts/tune/env.fake-cortexa72.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa72.cortexa72 b/scripts/tune/env.fake-cortexa72.cortexa72
index 69c6eb7f97..da8e675ff5 100644
--- a/scripts/tune/env.fake-cortexa72.cortexa72
+++ b/scripts/tune/env.fake-cortexa72.cortexa72
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa72 fake_cortexa72"
-TUNE_CCARGS=" -mcpu=cortex-a72 -march=armv8-a+crc+crypto"
+TUNE_CCARGS=" -mcpu=cortex-a72+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto cortexa72"
-TUNE_PKGARCH="cortexa72"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
+TUNE_FEATURES="aarch64 cortexa72 crc crypto"
+TUNE_PKGARCH="aarch64"
+export CC="aarch64-oe-linux-gcc -mcpu=cortex-a72+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73 b/scripts/tune/env.fake-cortexa73
deleted file mode 100644
index acea441f9c..0000000000
--- a/scripts/tune/env.fake-cortexa73
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa73"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa73 fake_cortexa73"
-TUNE_CCARGS=" -mcpu=cortex-a73 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto cortexa73"
-TUNE_PKGARCH="cortexa73"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35 b/scripts/tune/env.fake-cortexa73-cortexa35
deleted file mode 100644
index 78aa564d11..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa73-cortexa35 cortexa73-cortexa35-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa73-cortexa35 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa35"
-TUNE_PKGARCH="cortexa73-cortexa35"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.aarch64 b/scripts/tune/env.fake-cortexa73-cortexa35.aarch64
deleted file mode 100644
index 57ed5a6f88..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa73_cortexa35"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.aarch64_be b/scripts/tune/env.fake-cortexa73-cortexa35.aarch64_be
deleted file mode 100644
index 768bbcfb06..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa73_cortexa35"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv4
deleted file mode 100644
index d821ec4110..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv4b b/scripts/tune/env.fake-cortexa73-cortexa35.armv4b
deleted file mode 100644
index 6f93bc87ab..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv4t b/scripts/tune/env.fake-cortexa73-cortexa35.armv4t
deleted file mode 100644
index d5dcb271e7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv4tb b/scripts/tune/env.fake-cortexa73-cortexa35.armv4tb
deleted file mode 100644
index a79bed7cd4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5 b/scripts/tune/env.fake-cortexa73-cortexa35.armv5
deleted file mode 100644
index b1a61e0294..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5-vfp
deleted file mode 100644
index 4c4c3b06ac..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5b b/scripts/tune/env.fake-cortexa73-cortexa35.armv5b
deleted file mode 100644
index 66fae33778..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5b-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5b-vfp
deleted file mode 100644
index 1961df3b32..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5e b/scripts/tune/env.fake-cortexa73-cortexa35.armv5e
deleted file mode 100644
index 8474ea5062..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5e-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5e-vfp
deleted file mode 100644
index b3886bb70d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb b/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb
deleted file mode 100644
index 7380de3a85..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb-vfp
deleted file mode 100644
index b5c09a92b7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehf-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehf-vfp
deleted file mode 100644
index 1cffff96ae..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehfb-vfp
deleted file mode 100644
index 49a50eab3a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5hf-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5hf-vfp
deleted file mode 100644
index d7afb19326..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5hfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5hfb-vfp
deleted file mode 100644
index 133cdf9aea..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5t b/scripts/tune/env.fake-cortexa73-cortexa35.armv5t
deleted file mode 100644
index 3b7683f488..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5t-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5t-vfp
deleted file mode 100644
index c3014cda28..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb b/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb
deleted file mode 100644
index 4076e0768e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb-vfp
deleted file mode 100644
index 970a707c14..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5te b/scripts/tune/env.fake-cortexa73-cortexa35.armv5te
deleted file mode 100644
index aa8d6ce250..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5te-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5te-vfp
deleted file mode 100644
index a2abe83e4d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb b/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb
deleted file mode 100644
index 74657b1419..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb-vfp
deleted file mode 100644
index 744bef5111..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehf-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehf-vfp
deleted file mode 100644
index 86be936928..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehfb-vfp
deleted file mode 100644
index f2a7bc5063..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5thf-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5thf-vfp
deleted file mode 100644
index 9c59fdf320..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv5thfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv5thfb-vfp
deleted file mode 100644
index 79e287353a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6 b/scripts/tune/env.fake-cortexa73-cortexa35.armv6
deleted file mode 100644
index 2508e35329..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6-novfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv6-novfp
deleted file mode 100644
index 4bdc7d94f2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6b b/scripts/tune/env.fake-cortexa73-cortexa35.armv6b
deleted file mode 100644
index 3e31088c0d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6b-novfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv6b-novfp
deleted file mode 100644
index 5d051e2e3c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6hf b/scripts/tune/env.fake-cortexa73-cortexa35.armv6hf
deleted file mode 100644
index e3895ef8a2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6hfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv6hfb
deleted file mode 100644
index dd53b6317b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6t b/scripts/tune/env.fake-cortexa73-cortexa35.armv6t
deleted file mode 100644
index 900f0eb4e5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6t-novfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv6t-novfp
deleted file mode 100644
index e5a2966342..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb b/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb
deleted file mode 100644
index 45f95422e9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb-novfp b/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb-novfp
deleted file mode 100644
index 8930b47acb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6thf b/scripts/tune/env.fake-cortexa73-cortexa35.armv6thf
deleted file mode 100644
index d16a4a19e3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv6thfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv6thfb
deleted file mode 100644
index 6b65b92adf..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a
deleted file mode 100644
index dca758bd18..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon
deleted file mode 100644
index ad023b1367..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon-vfpv4
deleted file mode 100644
index 79772f53c7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3
deleted file mode 100644
index 549a272d76..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3d16
deleted file mode 100644
index 9c2baae4e8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv4d16
deleted file mode 100644
index a3eec1638c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab
deleted file mode 100644
index b43e5553fe..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon
deleted file mode 100644
index 04577da33a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon-vfpv4
deleted file mode 100644
index 6ab873e616..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3
deleted file mode 100644
index 7e0b12e987..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3d16
deleted file mode 100644
index dd30eb0c41..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv4d16
deleted file mode 100644
index e975239aa6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf
deleted file mode 100644
index ae3ff5981f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon
deleted file mode 100644
index f57052390a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon-vfpv4
deleted file mode 100644
index 697f2d302b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3
deleted file mode 100644
index e9103f2ce8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3d16
deleted file mode 100644
index 6e101acd1e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv4d16
deleted file mode 100644
index 28711502b8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb
deleted file mode 100644
index 361bacbbc7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon
deleted file mode 100644
index c82e35b2c3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 1d093654f6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3
deleted file mode 100644
index 2c58c88a68..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3d16
deleted file mode 100644
index 74240c8ce9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv4d16
deleted file mode 100644
index 8221947fab..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at
deleted file mode 100644
index 56ba36d85e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon
deleted file mode 100644
index 46d14eb24f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon-vfpv4
deleted file mode 100644
index 3b92956ea1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3
deleted file mode 100644
index bdc62d7a93..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3d16
deleted file mode 100644
index ff8df72492..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv4d16
deleted file mode 100644
index 8d1e904128..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb
deleted file mode 100644
index b3c12a81cb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon
deleted file mode 100644
index cf28138f65..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon-vfpv4
deleted file mode 100644
index fc851af5d5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3
deleted file mode 100644
index 30cad26a75..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3d16
deleted file mode 100644
index 68d1219335..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv4d16
deleted file mode 100644
index 63675e5365..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf
deleted file mode 100644
index e48b61acb1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon
deleted file mode 100644
index b4b1d252e5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon-vfpv4
deleted file mode 100644
index bde5ef594d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3
deleted file mode 100644
index 67a61c0081..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3d16
deleted file mode 100644
index c150be8f34..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv4d16
deleted file mode 100644
index 5ab8d252ba..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb
deleted file mode 100644
index 38be588959..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon
deleted file mode 100644
index 5c53e5b426..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon-vfpv4
deleted file mode 100644
index da9377b5a8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3
deleted file mode 100644
index fc63526010..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3d16
deleted file mode 100644
index 39c43bc382..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv4d16
deleted file mode 100644
index 97b1b83881..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve
deleted file mode 100644
index 10b9156ecd..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon
deleted file mode 100644
index d7020bea30..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon-vfpv4
deleted file mode 100644
index c671161220..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3
deleted file mode 100644
index c00b22eafb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3d16
deleted file mode 100644
index 9738272712..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv4d16
deleted file mode 100644
index 046867f915..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb
deleted file mode 100644
index 108be1c4d8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon
deleted file mode 100644
index b0f00e2447..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon-vfpv4
deleted file mode 100644
index 23d78d36dd..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3
deleted file mode 100644
index 107d765d4a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3d16
deleted file mode 100644
index ff5d39a6b8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv4d16
deleted file mode 100644
index 762793bd9e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf
deleted file mode 100644
index bf4424ae3f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon
deleted file mode 100644
index ab26e606e1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon-vfpv4
deleted file mode 100644
index dc244e327b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3
deleted file mode 100644
index 7a526bfca0..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3d16
deleted file mode 100644
index 08baf5dca5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv4d16
deleted file mode 100644
index c13ecd4186..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb
deleted file mode 100644
index d6cfb8f47d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon
deleted file mode 100644
index 09f1f775ab..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon-vfpv4
deleted file mode 100644
index b82e9715fd..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3
deleted file mode 100644
index 875332dbe9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3d16
deleted file mode 100644
index 9464c0be1d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv4d16
deleted file mode 100644
index 181d51c539..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet
deleted file mode 100644
index 842427c727..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon
deleted file mode 100644
index 93003d4523..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon-vfpv4
deleted file mode 100644
index 154e77f06c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3
deleted file mode 100644
index 67e4b08cfe..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3d16
deleted file mode 100644
index 759caa651d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv4d16
deleted file mode 100644
index 490b262833..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb
deleted file mode 100644
index 13a05c44c1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon
deleted file mode 100644
index 61c282f758..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon-vfpv4
deleted file mode 100644
index 3efa6903ec..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3
deleted file mode 100644
index 1a97042150..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3d16
deleted file mode 100644
index fb996534eb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv4d16
deleted file mode 100644
index b2c7cfb09d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf
deleted file mode 100644
index 254d134c98..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon
deleted file mode 100644
index 6a2d2584de..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon-vfpv4
deleted file mode 100644
index b905585fe5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3
deleted file mode 100644
index f644e1d24a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3d16
deleted file mode 100644
index 5b7fa48d37..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv4d16
deleted file mode 100644
index e4ad265905..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb
deleted file mode 100644
index 8b2e7f7168..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon
deleted file mode 100644
index f20e833292..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon-vfpv4
deleted file mode 100644
index fe6ea782d3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3
deleted file mode 100644
index 57ed09b359..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3d16
deleted file mode 100644
index 3197b81ed2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv4d16
deleted file mode 100644
index 91d0f6926e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a b/scripts/tune/env.fake-cortexa73-cortexa35.armv8a
deleted file mode 100644
index dd8e575330..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc b/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc
deleted file mode 100644
index eb86ecad61..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc-crypto
deleted file mode 100644
index 3f379932e8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crypto b/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crypto
deleted file mode 100644
index 8fdda381e2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35 b/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35
deleted file mode 100644
index 37afab7dc3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa73-cortexa35 fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa35"
-TUNE_PKGARCH="cortexa73-cortexa35"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35-crypto b/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35-crypto
deleted file mode 100644
index f54a580f79..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa35.cortexa73-cortexa35-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa73-cortexa35 cortexa73-cortexa35-crypto fake_cortexa73_cortexa35"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa35 crypto"
-TUNE_PKGARCH="cortexa73-cortexa35-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a35 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53 b/scripts/tune/env.fake-cortexa73-cortexa53
deleted file mode 100644
index 8626f1bef3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto cortexa73-cortexa53 cortexa73-cortexa53-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa73-cortexa53 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa53"
-TUNE_PKGARCH="cortexa73-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.aarch64 b/scripts/tune/env.fake-cortexa73-cortexa53.aarch64
deleted file mode 100644
index ef25db8bb4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa73_cortexa53"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.aarch64_be b/scripts/tune/env.fake-cortexa73-cortexa53.aarch64_be
deleted file mode 100644
index cba44febce..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa73_cortexa53"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv4
deleted file mode 100644
index 343938885c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv4b b/scripts/tune/env.fake-cortexa73-cortexa53.armv4b
deleted file mode 100644
index 7efa454a1f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv4t b/scripts/tune/env.fake-cortexa73-cortexa53.armv4t
deleted file mode 100644
index 68a4364696..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv4tb b/scripts/tune/env.fake-cortexa73-cortexa53.armv4tb
deleted file mode 100644
index c4bfef624e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5 b/scripts/tune/env.fake-cortexa73-cortexa53.armv5
deleted file mode 100644
index 230923f011..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5-vfp
deleted file mode 100644
index 6004597f21..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5b b/scripts/tune/env.fake-cortexa73-cortexa53.armv5b
deleted file mode 100644
index aa995e5c5d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5b-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5b-vfp
deleted file mode 100644
index f686f74421..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5e b/scripts/tune/env.fake-cortexa73-cortexa53.armv5e
deleted file mode 100644
index f9440fac11..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5e-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5e-vfp
deleted file mode 100644
index 5c4317a60f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb b/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb
deleted file mode 100644
index 5f8420ce36..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb-vfp
deleted file mode 100644
index a280f438d4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehf-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehf-vfp
deleted file mode 100644
index ba9a7dfac1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehfb-vfp
deleted file mode 100644
index 457196ba69..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5hf-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5hf-vfp
deleted file mode 100644
index 3d61c99ec0..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5hfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5hfb-vfp
deleted file mode 100644
index eb1b170e08..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5t b/scripts/tune/env.fake-cortexa73-cortexa53.armv5t
deleted file mode 100644
index 0b51d91d28..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5t-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5t-vfp
deleted file mode 100644
index 899507202a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb b/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb
deleted file mode 100644
index 2b4f587d54..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb-vfp
deleted file mode 100644
index 569aa3d2ed..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5te b/scripts/tune/env.fake-cortexa73-cortexa53.armv5te
deleted file mode 100644
index 1832e63198..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5te-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5te-vfp
deleted file mode 100644
index ef651f1727..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb b/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb
deleted file mode 100644
index e2baa5c253..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb-vfp
deleted file mode 100644
index 419fb50bca..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehf-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehf-vfp
deleted file mode 100644
index 4ac9e4d243..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehfb-vfp
deleted file mode 100644
index 6229771c9e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5thf-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5thf-vfp
deleted file mode 100644
index 49552fefeb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv5thfb-vfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv5thfb-vfp
deleted file mode 100644
index bbfecf9002..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6 b/scripts/tune/env.fake-cortexa73-cortexa53.armv6
deleted file mode 100644
index a4d4dfbf37..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6-novfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv6-novfp
deleted file mode 100644
index ef2debfb01..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6b b/scripts/tune/env.fake-cortexa73-cortexa53.armv6b
deleted file mode 100644
index 7568a048d2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6b-novfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv6b-novfp
deleted file mode 100644
index 6fd05188a6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6hf b/scripts/tune/env.fake-cortexa73-cortexa53.armv6hf
deleted file mode 100644
index 3db63f4d51..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6hfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv6hfb
deleted file mode 100644
index 0fc0c18a34..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6t b/scripts/tune/env.fake-cortexa73-cortexa53.armv6t
deleted file mode 100644
index f3f4f6b128..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6t-novfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv6t-novfp
deleted file mode 100644
index bca4e0821e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb b/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb
deleted file mode 100644
index 299bacbe41..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb-novfp b/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb-novfp
deleted file mode 100644
index 64a705b9e1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6thf b/scripts/tune/env.fake-cortexa73-cortexa53.armv6thf
deleted file mode 100644
index 0071d8c5c9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv6thfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv6thfb
deleted file mode 100644
index 099989dfd7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a
deleted file mode 100644
index f43205a6f7..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon
deleted file mode 100644
index 5b523cf50c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon-vfpv4
deleted file mode 100644
index 98ebe76b82..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3
deleted file mode 100644
index a1cb58407a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3d16
deleted file mode 100644
index 0e27c3e08a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv4d16
deleted file mode 100644
index a8f6a51414..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab
deleted file mode 100644
index ec2ed03832..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon
deleted file mode 100644
index 0f98642554..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon-vfpv4
deleted file mode 100644
index 4188288a2c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3
deleted file mode 100644
index bbec45c595..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3d16
deleted file mode 100644
index 5b7ea51813..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv4d16
deleted file mode 100644
index dd76f42427..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf
deleted file mode 100644
index d9dc5c4131..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon
deleted file mode 100644
index 9dee0d43e5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon-vfpv4
deleted file mode 100644
index 22925edda2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3
deleted file mode 100644
index 36d63aa92b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3d16
deleted file mode 100644
index 8a925af53c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv4d16
deleted file mode 100644
index 176f2a491c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb
deleted file mode 100644
index ac758637bb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon
deleted file mode 100644
index 93243fd0e4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon-vfpv4
deleted file mode 100644
index f2ed0e7724..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3
deleted file mode 100644
index 9fc2301a94..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3d16
deleted file mode 100644
index db2dc03ba6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv4d16
deleted file mode 100644
index 48fd9b406a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at
deleted file mode 100644
index 8f65f6dc7e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon
deleted file mode 100644
index ee2a9b72a8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon-vfpv4
deleted file mode 100644
index b458bc76f4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3
deleted file mode 100644
index a9b6b77b39..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3d16
deleted file mode 100644
index bbd667e040..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv4d16
deleted file mode 100644
index 7d40b06ec5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb
deleted file mode 100644
index deddf7f669..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon
deleted file mode 100644
index 706c25f45b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon-vfpv4
deleted file mode 100644
index 4f8b4d4dfd..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3
deleted file mode 100644
index 3e98aa35f6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3d16
deleted file mode 100644
index abb154810e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv4d16
deleted file mode 100644
index b47a90b71e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf
deleted file mode 100644
index 4181fca479..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon
deleted file mode 100644
index 38c4328fe9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon-vfpv4
deleted file mode 100644
index 277bbcb3b3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3
deleted file mode 100644
index ffa69d44fd..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3d16
deleted file mode 100644
index 5240952425..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv4d16
deleted file mode 100644
index 91e527fd8d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb
deleted file mode 100644
index 0c35cac20a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon
deleted file mode 100644
index 8278706f63..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon-vfpv4
deleted file mode 100644
index ebfbf7126e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3
deleted file mode 100644
index f26634deb6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3d16
deleted file mode 100644
index d7e37e5a1a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv4d16
deleted file mode 100644
index d96c33933c..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve
deleted file mode 100644
index 6c8199d62e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon
deleted file mode 100644
index 89c757cf34..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon-vfpv4
deleted file mode 100644
index 9a4ed6ae33..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3
deleted file mode 100644
index 400994771e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3d16
deleted file mode 100644
index fdcb6093e8..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv4d16
deleted file mode 100644
index 4dee36d5da..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb
deleted file mode 100644
index 51f915f26e..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon
deleted file mode 100644
index 0090bf3695..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon-vfpv4
deleted file mode 100644
index 69e871f467..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3
deleted file mode 100644
index 4e3205ac2d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3d16
deleted file mode 100644
index e304ac251f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv4d16
deleted file mode 100644
index 2cca9dc433..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf
deleted file mode 100644
index 872cc7d717..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon
deleted file mode 100644
index c3c8b026ea..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon-vfpv4
deleted file mode 100644
index 2bf22686cc..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3
deleted file mode 100644
index ab5360ad31..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3d16
deleted file mode 100644
index d31c2d6b64..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv4d16
deleted file mode 100644
index 2414179ddb..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb
deleted file mode 100644
index 786a2ff2f5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon
deleted file mode 100644
index 30d3963049..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 493f8a5881..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3
deleted file mode 100644
index e4ea0ab7e9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3d16
deleted file mode 100644
index 464636d1f9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv4d16
deleted file mode 100644
index cace5bbb60..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet
deleted file mode 100644
index 99335381dc..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon
deleted file mode 100644
index 525bb6c253..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon-vfpv4
deleted file mode 100644
index 73265f20db..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3
deleted file mode 100644
index 54e96112e4..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3d16
deleted file mode 100644
index 72548711a1..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv4d16
deleted file mode 100644
index 349c342d87..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb
deleted file mode 100644
index b70d6dfd0b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon
deleted file mode 100644
index 42362fa31b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon-vfpv4
deleted file mode 100644
index 170df6660d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3
deleted file mode 100644
index 479bead4ce..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3d16
deleted file mode 100644
index 6dea93d9e5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv4d16
deleted file mode 100644
index b442582c9b..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf
deleted file mode 100644
index 9f4e994769..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon
deleted file mode 100644
index b0447a62e6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon-vfpv4
deleted file mode 100644
index 8d90477dc2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3
deleted file mode 100644
index e37c2e995d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3d16
deleted file mode 100644
index 760d1131f6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv4d16
deleted file mode 100644
index bf01073ba9..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb
deleted file mode 100644
index 247a95403d..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon
deleted file mode 100644
index 6659be6bc2..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon-vfpv4
deleted file mode 100644
index f745aa6d3a..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3
deleted file mode 100644
index 9b65dce0d3..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3d16
deleted file mode 100644
index ed692a8537..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv4d16
deleted file mode 100644
index 77c76e1082..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a b/scripts/tune/env.fake-cortexa73-cortexa53.armv8a
deleted file mode 100644
index 25b16d9b69..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc b/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc
deleted file mode 100644
index 7ea3777a54..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc-crypto
deleted file mode 100644
index 5448ee7ad6..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crypto b/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crypto
deleted file mode 100644
index 1c64871118..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53 b/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53
deleted file mode 100644
index 961a62985f..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc cortexa73-cortexa53 fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa53"
-TUNE_PKGARCH="cortexa73-cortexa53"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53-crypto b/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53-crypto
deleted file mode 100644
index eb4e8b2be5..0000000000
--- a/scripts/tune/env.fake-cortexa73-cortexa53.cortexa73-cortexa53-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa73-cortexa53 cortexa73-cortexa53-crypto fake_cortexa73_cortexa53"
-TUNE_CCARGS=" -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc cortexa73-cortexa53 crypto"
-TUNE_PKGARCH="cortexa73-cortexa53-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73.cortex-a53 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.aarch64 b/scripts/tune/env.fake-cortexa73.aarch64
deleted file mode 100644
index 32f9ca4ff8..0000000000
--- a/scripts/tune/env.fake-cortexa73.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa73"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.aarch64_be b/scripts/tune/env.fake-cortexa73.aarch64_be
deleted file mode 100644
index 9e8736759b..0000000000
--- a/scripts/tune/env.fake-cortexa73.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa73"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv4 b/scripts/tune/env.fake-cortexa73.armv4
deleted file mode 100644
index 77bf8ef8b5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv4b b/scripts/tune/env.fake-cortexa73.armv4b
deleted file mode 100644
index 67b2a9b13f..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa73"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv4t b/scripts/tune/env.fake-cortexa73.armv4t
deleted file mode 100644
index 7dc2d9a628..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa73"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv4tb b/scripts/tune/env.fake-cortexa73.armv4tb
deleted file mode 100644
index 162eacc781..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa73"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5 b/scripts/tune/env.fake-cortexa73.armv5
deleted file mode 100644
index b8550b0a38..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5-vfp b/scripts/tune/env.fake-cortexa73.armv5-vfp
deleted file mode 100644
index 809e7ff911..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5b b/scripts/tune/env.fake-cortexa73.armv5b
deleted file mode 100644
index 4724a7396b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5b-vfp b/scripts/tune/env.fake-cortexa73.armv5b-vfp
deleted file mode 100644
index c055d7e75a..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5e b/scripts/tune/env.fake-cortexa73.armv5e
deleted file mode 100644
index db7d3d7836..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5e-vfp b/scripts/tune/env.fake-cortexa73.armv5e-vfp
deleted file mode 100644
index 10ba8a5d83..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5eb b/scripts/tune/env.fake-cortexa73.armv5eb
deleted file mode 100644
index 721e5d1a56..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5eb-vfp b/scripts/tune/env.fake-cortexa73.armv5eb-vfp
deleted file mode 100644
index e02b505bb7..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5ehf-vfp b/scripts/tune/env.fake-cortexa73.armv5ehf-vfp
deleted file mode 100644
index 5fe9337119..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa73.armv5ehfb-vfp
deleted file mode 100644
index b51726df3f..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5hf-vfp b/scripts/tune/env.fake-cortexa73.armv5hf-vfp
deleted file mode 100644
index 524c268236..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5hfb-vfp b/scripts/tune/env.fake-cortexa73.armv5hfb-vfp
deleted file mode 100644
index 3b4ddb1506..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5t b/scripts/tune/env.fake-cortexa73.armv5t
deleted file mode 100644
index 434f61839a..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5t-vfp b/scripts/tune/env.fake-cortexa73.armv5t-vfp
deleted file mode 100644
index 48eae6565e..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5tb b/scripts/tune/env.fake-cortexa73.armv5tb
deleted file mode 100644
index 472213c0db..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5tb-vfp b/scripts/tune/env.fake-cortexa73.armv5tb-vfp
deleted file mode 100644
index f71a275445..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5te b/scripts/tune/env.fake-cortexa73.armv5te
deleted file mode 100644
index d56d350b7b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5te-vfp b/scripts/tune/env.fake-cortexa73.armv5te-vfp
deleted file mode 100644
index d96031481f..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5teb b/scripts/tune/env.fake-cortexa73.armv5teb
deleted file mode 100644
index f646a30efe..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5teb-vfp b/scripts/tune/env.fake-cortexa73.armv5teb-vfp
deleted file mode 100644
index aec7a15079..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5tehf-vfp b/scripts/tune/env.fake-cortexa73.armv5tehf-vfp
deleted file mode 100644
index 5d9fd77402..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa73.armv5tehfb-vfp
deleted file mode 100644
index 4ae825bd8e..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5thf-vfp b/scripts/tune/env.fake-cortexa73.armv5thf-vfp
deleted file mode 100644
index fcee0a4bb2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv5thfb-vfp b/scripts/tune/env.fake-cortexa73.armv5thfb-vfp
deleted file mode 100644
index 2b530539dd..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6 b/scripts/tune/env.fake-cortexa73.armv6
deleted file mode 100644
index 4fa329c1d3..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6-novfp b/scripts/tune/env.fake-cortexa73.armv6-novfp
deleted file mode 100644
index a939817f3a..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa73"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6b b/scripts/tune/env.fake-cortexa73.armv6b
deleted file mode 100644
index ce1eb79daf..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6b-novfp b/scripts/tune/env.fake-cortexa73.armv6b-novfp
deleted file mode 100644
index 3237127d20..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa73"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6hf b/scripts/tune/env.fake-cortexa73.armv6hf
deleted file mode 100644
index 818ddfcd64..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6hfb b/scripts/tune/env.fake-cortexa73.armv6hfb
deleted file mode 100644
index dc6bb439ab..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6t b/scripts/tune/env.fake-cortexa73.armv6t
deleted file mode 100644
index 36dd4c90ef..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6t-novfp b/scripts/tune/env.fake-cortexa73.armv6t-novfp
deleted file mode 100644
index 76fa1523f2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6tb b/scripts/tune/env.fake-cortexa73.armv6tb
deleted file mode 100644
index 1e7bc661f0..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6tb-novfp b/scripts/tune/env.fake-cortexa73.armv6tb-novfp
deleted file mode 100644
index 7e56bf66cc..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6thf b/scripts/tune/env.fake-cortexa73.armv6thf
deleted file mode 100644
index 66dff82bf7..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv6thfb b/scripts/tune/env.fake-cortexa73.armv6thfb
deleted file mode 100644
index 78ee38a1db..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a b/scripts/tune/env.fake-cortexa73.armv7a
deleted file mode 100644
index bc0280211b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a-neon b/scripts/tune/env.fake-cortexa73.armv7a-neon
deleted file mode 100644
index c09d20e088..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7a-neon-vfpv4
deleted file mode 100644
index e7cd22f94f..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7a-vfpv3
deleted file mode 100644
index 3cedf6fc3b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7a-vfpv3d16
deleted file mode 100644
index 135d7443c5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7a-vfpv4d16
deleted file mode 100644
index 72113784e2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab b/scripts/tune/env.fake-cortexa73.armv7ab
deleted file mode 100644
index 8db0e39f7c..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab-neon b/scripts/tune/env.fake-cortexa73.armv7ab-neon
deleted file mode 100644
index 39f28b3233..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7ab-neon-vfpv4
deleted file mode 100644
index f98ad28f8b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3
deleted file mode 100644
index 528c6b9bad..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3d16
deleted file mode 100644
index f943578264..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7ab-vfpv4d16
deleted file mode 100644
index 49d6eb91a7..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf b/scripts/tune/env.fake-cortexa73.armv7ahf
deleted file mode 100644
index 9eb5622f86..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf-neon b/scripts/tune/env.fake-cortexa73.armv7ahf-neon
deleted file mode 100644
index 9ac9c9bb97..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7ahf-neon-vfpv4
deleted file mode 100644
index bcdcdb0c76..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3
deleted file mode 100644
index d6edd132f9..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3d16
deleted file mode 100644
index b5aa66638d..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv4d16
deleted file mode 100644
index 24c78d9ac8..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb b/scripts/tune/env.fake-cortexa73.armv7ahfb
deleted file mode 100644
index cfe8c23640..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb-neon b/scripts/tune/env.fake-cortexa73.armv7ahfb-neon
deleted file mode 100644
index fff46309ef..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7ahfb-neon-vfpv4
deleted file mode 100644
index bd55d2feb0..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3
deleted file mode 100644
index b7fe023042..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3d16
deleted file mode 100644
index 4b7069fab6..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv4d16
deleted file mode 100644
index 38d1f8bd5a..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at b/scripts/tune/env.fake-cortexa73.armv7at
deleted file mode 100644
index 0a47ebdc8b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at-neon b/scripts/tune/env.fake-cortexa73.armv7at-neon
deleted file mode 100644
index 78372f75d0..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7at-neon-vfpv4
deleted file mode 100644
index 8366d583a7..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7at-vfpv3
deleted file mode 100644
index ea6d8139c2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7at-vfpv3d16
deleted file mode 100644
index 9ad2adb35d..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7at-vfpv4d16
deleted file mode 100644
index 3a80c19f49..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb b/scripts/tune/env.fake-cortexa73.armv7atb
deleted file mode 100644
index 09d9070dee..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb-neon b/scripts/tune/env.fake-cortexa73.armv7atb-neon
deleted file mode 100644
index 5f5f7285a4..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7atb-neon-vfpv4
deleted file mode 100644
index c2d057ac10..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3
deleted file mode 100644
index 775abdb9e3..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3d16
deleted file mode 100644
index 09c1c05b67..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7atb-vfpv4d16
deleted file mode 100644
index 09d13a3f62..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf b/scripts/tune/env.fake-cortexa73.armv7athf
deleted file mode 100644
index 1de2d4ba1f..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf-neon b/scripts/tune/env.fake-cortexa73.armv7athf-neon
deleted file mode 100644
index d0528c3449..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7athf-neon-vfpv4
deleted file mode 100644
index 1fb76479fe..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3
deleted file mode 100644
index 44056acf7b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3d16
deleted file mode 100644
index e072259625..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7athf-vfpv4d16
deleted file mode 100644
index 65eaa26460..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb b/scripts/tune/env.fake-cortexa73.armv7athfb
deleted file mode 100644
index f7206f9ba5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb-neon b/scripts/tune/env.fake-cortexa73.armv7athfb-neon
deleted file mode 100644
index f5f680f4d9..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7athfb-neon-vfpv4
deleted file mode 100644
index f7229a8b57..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3
deleted file mode 100644
index 9d08813de2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3d16
deleted file mode 100644
index d7dff50590..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv4d16
deleted file mode 100644
index 72560d4fbc..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve b/scripts/tune/env.fake-cortexa73.armv7ve
deleted file mode 100644
index d15ee92d7d..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve-neon b/scripts/tune/env.fake-cortexa73.armv7ve-neon
deleted file mode 100644
index 067cfe96ae..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7ve-neon-vfpv4
deleted file mode 100644
index 2a0e598a12..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3
deleted file mode 100644
index 07803c74b9..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3d16
deleted file mode 100644
index 75356fb16c..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7ve-vfpv4d16
deleted file mode 100644
index 43d389cbd4..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb b/scripts/tune/env.fake-cortexa73.armv7veb
deleted file mode 100644
index 56bcff23cc..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb-neon b/scripts/tune/env.fake-cortexa73.armv7veb-neon
deleted file mode 100644
index 486ca54306..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7veb-neon-vfpv4
deleted file mode 100644
index 3c68dd9fdc..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3
deleted file mode 100644
index abcaf8fae0..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3d16
deleted file mode 100644
index e1858abcff..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7veb-vfpv4d16
deleted file mode 100644
index dd6d5591d5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf b/scripts/tune/env.fake-cortexa73.armv7vehf
deleted file mode 100644
index 1ef66f5904..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf-neon b/scripts/tune/env.fake-cortexa73.armv7vehf-neon
deleted file mode 100644
index 4c608684fa..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vehf-neon-vfpv4
deleted file mode 100644
index e63600bc03..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3
deleted file mode 100644
index a24f758039..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3d16
deleted file mode 100644
index 8a31eb1891..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv4d16
deleted file mode 100644
index 8312ea9267..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb b/scripts/tune/env.fake-cortexa73.armv7vehfb
deleted file mode 100644
index 3b10bb6a5c..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb-neon b/scripts/tune/env.fake-cortexa73.armv7vehfb-neon
deleted file mode 100644
index e34c791f46..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 6b87902c50..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3
deleted file mode 100644
index ec04821acf..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3d16
deleted file mode 100644
index 640b68d884..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv4d16
deleted file mode 100644
index 1240f02eb5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet b/scripts/tune/env.fake-cortexa73.armv7vet
deleted file mode 100644
index 2fed9e53a1..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet-neon b/scripts/tune/env.fake-cortexa73.armv7vet-neon
deleted file mode 100644
index adac15e842..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vet-neon-vfpv4
deleted file mode 100644
index ff3e10fc68..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3
deleted file mode 100644
index b6ae963340..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3d16
deleted file mode 100644
index 0d8281019c..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vet-vfpv4d16
deleted file mode 100644
index c93299290b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb b/scripts/tune/env.fake-cortexa73.armv7vetb
deleted file mode 100644
index 589ca0257b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb-neon b/scripts/tune/env.fake-cortexa73.armv7vetb-neon
deleted file mode 100644
index fc278b9fa8..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vetb-neon-vfpv4
deleted file mode 100644
index f1b2fe68e2..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3
deleted file mode 100644
index c24556607b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3d16
deleted file mode 100644
index a0cab111b5..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv4d16
deleted file mode 100644
index 5863335c3c..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf b/scripts/tune/env.fake-cortexa73.armv7vethf
deleted file mode 100644
index afb43d5e74..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf-neon b/scripts/tune/env.fake-cortexa73.armv7vethf-neon
deleted file mode 100644
index 37c50c0c94..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vethf-neon-vfpv4
deleted file mode 100644
index c599b719f3..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3
deleted file mode 100644
index dd40850011..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3d16
deleted file mode 100644
index 2b018d3528..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv4d16
deleted file mode 100644
index 5f6eb17a71..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb b/scripts/tune/env.fake-cortexa73.armv7vethfb
deleted file mode 100644
index 6b62d7b415..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb-neon b/scripts/tune/env.fake-cortexa73.armv7vethfb-neon
deleted file mode 100644
index cae5c139c1..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa73.armv7vethfb-neon-vfpv4
deleted file mode 100644
index f72863ff01..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3
deleted file mode 100644
index 89ded1e879..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3d16
deleted file mode 100644
index 27cc8ae06e..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv4d16
deleted file mode 100644
index 630d391b28..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa73"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv8a b/scripts/tune/env.fake-cortexa73.armv8a
deleted file mode 100644
index 9dcdda1574..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa73"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv8a-crc b/scripts/tune/env.fake-cortexa73.armv8a-crc
deleted file mode 100644
index 33d761961b..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa73"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa73.armv8a-crc-crypto
deleted file mode 100644
index 1d7df36fa7..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa73"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.armv8a-crypto b/scripts/tune/env.fake-cortexa73.armv8a-crypto
deleted file mode 100644
index 0bb602c340..0000000000
--- a/scripts/tune/env.fake-cortexa73.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa73"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa73.cortexa73 b/scripts/tune/env.fake-cortexa73.cortexa73
deleted file mode 100644
index 057cc5cf1e..0000000000
--- a/scripts/tune/env.fake-cortexa73.cortexa73
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto cortexa73 fake_cortexa73"
-TUNE_CCARGS=" -mcpu=cortex-a73 -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto cortexa73"
-TUNE_PKGARCH="cortexa73"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a73 -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75 b/scripts/tune/env.fake-cortexa75
deleted file mode 100644
index 87358d846e..0000000000
--- a/scripts/tune/env.fake-cortexa75
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa75"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa75 fake_cortexa75"
-TUNE_CCARGS=" -mcpu=cortex-a75 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa75"
-TUNE_PKGARCH="cortexa75"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a75 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55 b/scripts/tune/env.fake-cortexa75-cortexa55
deleted file mode 100644
index 6a235abc53..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa75-cortexa55 cortexa75-cortexa55-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a cortexa75-cortexa55 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa75-cortexa55"
-TUNE_PKGARCH="cortexa75-cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.aarch64 b/scripts/tune/env.fake-cortexa75-cortexa55.aarch64
deleted file mode 100644
index 70aaf82393..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa75_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.aarch64_be b/scripts/tune/env.fake-cortexa75-cortexa55.aarch64_be
deleted file mode 100644
index ecc93fe7e8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa75_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv4
deleted file mode 100644
index 08da6ea5e1..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv4b b/scripts/tune/env.fake-cortexa75-cortexa55.armv4b
deleted file mode 100644
index 5561ea0559..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv4t b/scripts/tune/env.fake-cortexa75-cortexa55.armv4t
deleted file mode 100644
index 9d948301e1..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv4tb b/scripts/tune/env.fake-cortexa75-cortexa55.armv4tb
deleted file mode 100644
index 1fec92676f..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5 b/scripts/tune/env.fake-cortexa75-cortexa55.armv5
deleted file mode 100644
index b18a07ca66..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5-vfp
deleted file mode 100644
index a030b02694..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5b b/scripts/tune/env.fake-cortexa75-cortexa55.armv5b
deleted file mode 100644
index 09b4f0ad63..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5b-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5b-vfp
deleted file mode 100644
index 631656afa2..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5e b/scripts/tune/env.fake-cortexa75-cortexa55.armv5e
deleted file mode 100644
index 72ed3fbfa8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5e-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5e-vfp
deleted file mode 100644
index 48362f6146..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb b/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb
deleted file mode 100644
index 87b467a780..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb-vfp
deleted file mode 100644
index 236b6b86d9..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehf-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehf-vfp
deleted file mode 100644
index cba1e41f34..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehfb-vfp
deleted file mode 100644
index f7503a0562..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5hf-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5hf-vfp
deleted file mode 100644
index ee9e6d68c6..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5hfb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5hfb-vfp
deleted file mode 100644
index 5aab78e2aa..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5t b/scripts/tune/env.fake-cortexa75-cortexa55.armv5t
deleted file mode 100644
index 081eb3015d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5t-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5t-vfp
deleted file mode 100644
index 916888a930..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb b/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb
deleted file mode 100644
index e0f9fcfbd2..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb-vfp
deleted file mode 100644
index 47b406c285..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5te b/scripts/tune/env.fake-cortexa75-cortexa55.armv5te
deleted file mode 100644
index 9f5a74293e..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5te-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5te-vfp
deleted file mode 100644
index f357a2863d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb b/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb
deleted file mode 100644
index e42fdacb22..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb-vfp
deleted file mode 100644
index cb646203af..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehf-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehf-vfp
deleted file mode 100644
index aeea42bc21..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehfb-vfp
deleted file mode 100644
index 7453d3d3d1..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5thf-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5thf-vfp
deleted file mode 100644
index 9aa4de9046..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv5thfb-vfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv5thfb-vfp
deleted file mode 100644
index 30501417fb..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6 b/scripts/tune/env.fake-cortexa75-cortexa55.armv6
deleted file mode 100644
index ce945fa0a0..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6-novfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv6-novfp
deleted file mode 100644
index e418b00dae..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6b b/scripts/tune/env.fake-cortexa75-cortexa55.armv6b
deleted file mode 100644
index bfadc6c879..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6b-novfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv6b-novfp
deleted file mode 100644
index 0f04713c12..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6hf b/scripts/tune/env.fake-cortexa75-cortexa55.armv6hf
deleted file mode 100644
index 1f90aa8196..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6hfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv6hfb
deleted file mode 100644
index 08760f97db..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6t b/scripts/tune/env.fake-cortexa75-cortexa55.armv6t
deleted file mode 100644
index 96d1757ce8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6t-novfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv6t-novfp
deleted file mode 100644
index 6d4f375845..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb b/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb
deleted file mode 100644
index 0b17e3c9a8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb-novfp b/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb-novfp
deleted file mode 100644
index ca5472b7ba..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6thf b/scripts/tune/env.fake-cortexa75-cortexa55.armv6thf
deleted file mode 100644
index a5bcb0e5ba..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv6thfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv6thfb
deleted file mode 100644
index 3928d01f5d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a
deleted file mode 100644
index 105ddce7f3..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon
deleted file mode 100644
index 0e57d182a7..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon-vfpv4
deleted file mode 100644
index bb20deec7a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3
deleted file mode 100644
index ae80055b05..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3d16
deleted file mode 100644
index bd926f6f09..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv4d16
deleted file mode 100644
index 0cbe58438c..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab
deleted file mode 100644
index 2a9da78174..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon
deleted file mode 100644
index a7d58a3cf1..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon-vfpv4
deleted file mode 100644
index cadce8ad43..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3
deleted file mode 100644
index 5e1453f003..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3d16
deleted file mode 100644
index 02524bf586..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv4d16
deleted file mode 100644
index 9d5b1fe248..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf
deleted file mode 100644
index bd26073858..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon
deleted file mode 100644
index 8b603e8f61..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon-vfpv4
deleted file mode 100644
index 4fbd52cacd..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3
deleted file mode 100644
index 0b130d1d97..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3d16
deleted file mode 100644
index 69380f2095..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv4d16
deleted file mode 100644
index c56e59e917..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb
deleted file mode 100644
index 8a743cb6b4..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon
deleted file mode 100644
index e6ae76a290..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon-vfpv4
deleted file mode 100644
index dc57076486..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3
deleted file mode 100644
index 3a2c451497..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3d16
deleted file mode 100644
index f4b66a233f..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv4d16
deleted file mode 100644
index f51b948996..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at
deleted file mode 100644
index f1160d7d8f..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon
deleted file mode 100644
index 4efad0dc1a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon-vfpv4
deleted file mode 100644
index d32392006d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3
deleted file mode 100644
index ebff26868c..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3d16
deleted file mode 100644
index 481c822d92..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv4d16
deleted file mode 100644
index 94e84cd69e..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb
deleted file mode 100644
index 8ea2df27c8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon
deleted file mode 100644
index 6f905aaa71..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon-vfpv4
deleted file mode 100644
index 37a79a9ad7..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3
deleted file mode 100644
index cab88ed727..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3d16
deleted file mode 100644
index 622430f9de..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv4d16
deleted file mode 100644
index 8500157485..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf
deleted file mode 100644
index d3b07f9f0d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon
deleted file mode 100644
index b5b6c725f6..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon-vfpv4
deleted file mode 100644
index 4e6c525233..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3
deleted file mode 100644
index 6642e940a8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3d16
deleted file mode 100644
index add0e83bbd..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv4d16
deleted file mode 100644
index a9c1abada8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb
deleted file mode 100644
index e7985aaf48..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon
deleted file mode 100644
index 52f78b6f50..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon-vfpv4
deleted file mode 100644
index c5cf14311c..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3
deleted file mode 100644
index 541d2b7a6e..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3d16
deleted file mode 100644
index f00828d171..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv4d16
deleted file mode 100644
index 26dd01d75e..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve
deleted file mode 100644
index 1e51d3bd77..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon
deleted file mode 100644
index 41de9fcd70..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon-vfpv4
deleted file mode 100644
index 42fde85d92..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3
deleted file mode 100644
index f65a739873..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3d16
deleted file mode 100644
index ff0240d9ee..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv4d16
deleted file mode 100644
index c75eae1686..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb
deleted file mode 100644
index 84d9a6149d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon
deleted file mode 100644
index cbd5257acb..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon-vfpv4
deleted file mode 100644
index d171561ed3..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3
deleted file mode 100644
index 5dd8be4ba8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3d16
deleted file mode 100644
index 93e063e56a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv4d16
deleted file mode 100644
index fece997c53..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf
deleted file mode 100644
index def7f02f49..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon
deleted file mode 100644
index 99e3944576..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon-vfpv4
deleted file mode 100644
index 9333150350..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3
deleted file mode 100644
index c34d29c9b5..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3d16
deleted file mode 100644
index 20e14c1a4b..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv4d16
deleted file mode 100644
index 7dcbe21c6a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb
deleted file mode 100644
index 665d15cef5..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon
deleted file mode 100644
index 71409e8e5d..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 3f93a9a0c8..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3
deleted file mode 100644
index a6d446ad8c..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3d16
deleted file mode 100644
index 8acfec9fad..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv4d16
deleted file mode 100644
index 19a44145da..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet
deleted file mode 100644
index 90180c12e2..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon
deleted file mode 100644
index 9ac7c42b3b..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon-vfpv4
deleted file mode 100644
index 18ef14772a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3
deleted file mode 100644
index 834c6fbb20..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3d16
deleted file mode 100644
index e42fa81e0a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv4d16
deleted file mode 100644
index c7219827a2..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb
deleted file mode 100644
index a6049f3972..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon
deleted file mode 100644
index 0bc220a61c..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon-vfpv4
deleted file mode 100644
index 265a3b4695..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3
deleted file mode 100644
index 06bf657858..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3d16
deleted file mode 100644
index d156f54cc1..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv4d16
deleted file mode 100644
index 4b7c5e4716..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf
deleted file mode 100644
index 9de6c7ef79..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon
deleted file mode 100644
index d2122e022e..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon-vfpv4
deleted file mode 100644
index 4db434e932..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3
deleted file mode 100644
index 73c8e0573b..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3d16
deleted file mode 100644
index 0d1816f049..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv4d16
deleted file mode 100644
index be9107c56a..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb
deleted file mode 100644
index 55f076e5be..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon
deleted file mode 100644
index 90bbae20e4..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon-vfpv4
deleted file mode 100644
index a708bf4258..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3
deleted file mode 100644
index 2f1a9f4d30..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3d16
deleted file mode 100644
index 5d50a6bc42..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv4d16
deleted file mode 100644
index fff585469b..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a b/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a
deleted file mode 100644
index 2c68466cc0..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a-crypto b/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a-crypto
deleted file mode 100644
index b9afac2dc9..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a b/scripts/tune/env.fake-cortexa75-cortexa55.armv8a
deleted file mode 100644
index 59a0d4fbe3..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc b/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc
deleted file mode 100644
index 596d4224dd..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc-crypto
deleted file mode 100644
index 13d81aa153..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crypto b/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crypto
deleted file mode 100644
index 1ee69df7c4..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55 b/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55
deleted file mode 100644
index d04be5e95b..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a cortexa75-cortexa55 fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa75-cortexa55"
-TUNE_PKGARCH="cortexa75-cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55-crypto b/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55-crypto
deleted file mode 100644
index 1e7b2eba81..0000000000
--- a/scripts/tune/env.fake-cortexa75-cortexa55.cortexa75-cortexa55-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa75-cortexa55 cortexa75-cortexa55-crypto fake_cortexa75_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa75-cortexa55 crypto"
-TUNE_PKGARCH="cortexa75-cortexa55-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a75.cortex-a55 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.aarch64 b/scripts/tune/env.fake-cortexa75.aarch64
deleted file mode 100644
index c764ed2b6e..0000000000
--- a/scripts/tune/env.fake-cortexa75.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa75"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.aarch64_be b/scripts/tune/env.fake-cortexa75.aarch64_be
deleted file mode 100644
index ac600aa5b7..0000000000
--- a/scripts/tune/env.fake-cortexa75.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa75"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv4 b/scripts/tune/env.fake-cortexa75.armv4
deleted file mode 100644
index 60a3ff6e37..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv4b b/scripts/tune/env.fake-cortexa75.armv4b
deleted file mode 100644
index e991a2ae0a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa75"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv4t b/scripts/tune/env.fake-cortexa75.armv4t
deleted file mode 100644
index be0eafed47..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa75"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv4tb b/scripts/tune/env.fake-cortexa75.armv4tb
deleted file mode 100644
index fc2c993c49..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa75"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5 b/scripts/tune/env.fake-cortexa75.armv5
deleted file mode 100644
index 995e577540..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5-vfp b/scripts/tune/env.fake-cortexa75.armv5-vfp
deleted file mode 100644
index 2626b5f434..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5b b/scripts/tune/env.fake-cortexa75.armv5b
deleted file mode 100644
index 1b5d10b0a1..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5b-vfp b/scripts/tune/env.fake-cortexa75.armv5b-vfp
deleted file mode 100644
index 61adc7dd49..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5e b/scripts/tune/env.fake-cortexa75.armv5e
deleted file mode 100644
index c0f3447496..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5e-vfp b/scripts/tune/env.fake-cortexa75.armv5e-vfp
deleted file mode 100644
index 12e2355d66..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5eb b/scripts/tune/env.fake-cortexa75.armv5eb
deleted file mode 100644
index f7b39f5f9c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5eb-vfp b/scripts/tune/env.fake-cortexa75.armv5eb-vfp
deleted file mode 100644
index cbef2e6749..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5ehf-vfp b/scripts/tune/env.fake-cortexa75.armv5ehf-vfp
deleted file mode 100644
index 1bd09bf225..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa75.armv5ehfb-vfp
deleted file mode 100644
index cf4f4a87e1..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5hf-vfp b/scripts/tune/env.fake-cortexa75.armv5hf-vfp
deleted file mode 100644
index f54110c563..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5hfb-vfp b/scripts/tune/env.fake-cortexa75.armv5hfb-vfp
deleted file mode 100644
index 6c9a9ef2ee..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5t b/scripts/tune/env.fake-cortexa75.armv5t
deleted file mode 100644
index 8b661d125e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5t-vfp b/scripts/tune/env.fake-cortexa75.armv5t-vfp
deleted file mode 100644
index d3a313400a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5tb b/scripts/tune/env.fake-cortexa75.armv5tb
deleted file mode 100644
index ca57bf69f2..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5tb-vfp b/scripts/tune/env.fake-cortexa75.armv5tb-vfp
deleted file mode 100644
index ba18b071ff..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5te b/scripts/tune/env.fake-cortexa75.armv5te
deleted file mode 100644
index f8d69dfacc..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5te-vfp b/scripts/tune/env.fake-cortexa75.armv5te-vfp
deleted file mode 100644
index fe86ce3f82..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5teb b/scripts/tune/env.fake-cortexa75.armv5teb
deleted file mode 100644
index 3a2a29bcf7..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5teb-vfp b/scripts/tune/env.fake-cortexa75.armv5teb-vfp
deleted file mode 100644
index 0df77bc145..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5tehf-vfp b/scripts/tune/env.fake-cortexa75.armv5tehf-vfp
deleted file mode 100644
index 73dcbd2eb1..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa75.armv5tehfb-vfp
deleted file mode 100644
index 4224101b3f..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5thf-vfp b/scripts/tune/env.fake-cortexa75.armv5thf-vfp
deleted file mode 100644
index 5c5c226cb2..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv5thfb-vfp b/scripts/tune/env.fake-cortexa75.armv5thfb-vfp
deleted file mode 100644
index 9384933b5e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6 b/scripts/tune/env.fake-cortexa75.armv6
deleted file mode 100644
index d4c29f60ad..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6-novfp b/scripts/tune/env.fake-cortexa75.armv6-novfp
deleted file mode 100644
index 7a5ed9e97a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa75"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6b b/scripts/tune/env.fake-cortexa75.armv6b
deleted file mode 100644
index 8f1322767b..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6b-novfp b/scripts/tune/env.fake-cortexa75.armv6b-novfp
deleted file mode 100644
index 959d6369e0..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa75"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6hf b/scripts/tune/env.fake-cortexa75.armv6hf
deleted file mode 100644
index f3e1634535..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6hfb b/scripts/tune/env.fake-cortexa75.armv6hfb
deleted file mode 100644
index fc964d57e3..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6t b/scripts/tune/env.fake-cortexa75.armv6t
deleted file mode 100644
index fc6214e931..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6t-novfp b/scripts/tune/env.fake-cortexa75.armv6t-novfp
deleted file mode 100644
index cf1ce3afc8..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6tb b/scripts/tune/env.fake-cortexa75.armv6tb
deleted file mode 100644
index 9627d5b2a7..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6tb-novfp b/scripts/tune/env.fake-cortexa75.armv6tb-novfp
deleted file mode 100644
index 572f0ea5df..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6thf b/scripts/tune/env.fake-cortexa75.armv6thf
deleted file mode 100644
index 4796958ff9..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv6thfb b/scripts/tune/env.fake-cortexa75.armv6thfb
deleted file mode 100644
index 06bbaf75c4..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a b/scripts/tune/env.fake-cortexa75.armv7a
deleted file mode 100644
index 32a6015baa..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a-neon b/scripts/tune/env.fake-cortexa75.armv7a-neon
deleted file mode 100644
index 48fef73c9d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7a-neon-vfpv4
deleted file mode 100644
index 8f93217504..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7a-vfpv3
deleted file mode 100644
index d068ad2542..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7a-vfpv3d16
deleted file mode 100644
index b46603c55d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7a-vfpv4d16
deleted file mode 100644
index cf14eabf9d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab b/scripts/tune/env.fake-cortexa75.armv7ab
deleted file mode 100644
index 28f83bf06a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab-neon b/scripts/tune/env.fake-cortexa75.armv7ab-neon
deleted file mode 100644
index 47b49dbbab..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7ab-neon-vfpv4
deleted file mode 100644
index 79c650df7c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3
deleted file mode 100644
index 82927cb8b6..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3d16
deleted file mode 100644
index a88c9c9351..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7ab-vfpv4d16
deleted file mode 100644
index f7ac17aac4..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf b/scripts/tune/env.fake-cortexa75.armv7ahf
deleted file mode 100644
index 33508199de..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf-neon b/scripts/tune/env.fake-cortexa75.armv7ahf-neon
deleted file mode 100644
index 616f3c7103..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7ahf-neon-vfpv4
deleted file mode 100644
index 8b6b7e906e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3
deleted file mode 100644
index 2fc5fdd139..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3d16
deleted file mode 100644
index 93905c27d7..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv4d16
deleted file mode 100644
index a986b8d5f6..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb b/scripts/tune/env.fake-cortexa75.armv7ahfb
deleted file mode 100644
index 201876cefa..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb-neon b/scripts/tune/env.fake-cortexa75.armv7ahfb-neon
deleted file mode 100644
index 65dd454cc8..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 48cc838062..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3
deleted file mode 100644
index 30846f972e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3d16
deleted file mode 100644
index f967d7ea2d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv4d16
deleted file mode 100644
index cfaf69da6f..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at b/scripts/tune/env.fake-cortexa75.armv7at
deleted file mode 100644
index 0590b64204..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at-neon b/scripts/tune/env.fake-cortexa75.armv7at-neon
deleted file mode 100644
index b2b3450c6c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7at-neon-vfpv4
deleted file mode 100644
index f6cd2441ef..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7at-vfpv3
deleted file mode 100644
index bdbf798ba4..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7at-vfpv3d16
deleted file mode 100644
index c3f1d95db1..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7at-vfpv4d16
deleted file mode 100644
index b7a075c9d0..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb b/scripts/tune/env.fake-cortexa75.armv7atb
deleted file mode 100644
index b166ee9968..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb-neon b/scripts/tune/env.fake-cortexa75.armv7atb-neon
deleted file mode 100644
index 1d5f14721e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7atb-neon-vfpv4
deleted file mode 100644
index fb1d13fc95..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3
deleted file mode 100644
index 84540ff340..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3d16
deleted file mode 100644
index 62ebb5d85e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7atb-vfpv4d16
deleted file mode 100644
index 80e4ce4967..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf b/scripts/tune/env.fake-cortexa75.armv7athf
deleted file mode 100644
index 0687ada10b..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf-neon b/scripts/tune/env.fake-cortexa75.armv7athf-neon
deleted file mode 100644
index 4ae9bd7a05..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7athf-neon-vfpv4
deleted file mode 100644
index 523db8cdbf..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3
deleted file mode 100644
index 3cede091bb..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3d16
deleted file mode 100644
index 7ded768896..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7athf-vfpv4d16
deleted file mode 100644
index 8a86060ab6..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb b/scripts/tune/env.fake-cortexa75.armv7athfb
deleted file mode 100644
index 21ce74a383..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb-neon b/scripts/tune/env.fake-cortexa75.armv7athfb-neon
deleted file mode 100644
index 58cd35bf63..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7athfb-neon-vfpv4
deleted file mode 100644
index 26e9e24c8e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3
deleted file mode 100644
index 238c9336aa..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3d16
deleted file mode 100644
index 17291c8a72..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv4d16
deleted file mode 100644
index 968af0cf97..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve b/scripts/tune/env.fake-cortexa75.armv7ve
deleted file mode 100644
index 53a70afc9e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve-neon b/scripts/tune/env.fake-cortexa75.armv7ve-neon
deleted file mode 100644
index 312326be9c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7ve-neon-vfpv4
deleted file mode 100644
index 733ba3f2d8..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3
deleted file mode 100644
index e6d22a1979..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3d16
deleted file mode 100644
index 49a9e501c1..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7ve-vfpv4d16
deleted file mode 100644
index 761519e8fa..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb b/scripts/tune/env.fake-cortexa75.armv7veb
deleted file mode 100644
index 033c5f286e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb-neon b/scripts/tune/env.fake-cortexa75.armv7veb-neon
deleted file mode 100644
index 17b123bba6..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7veb-neon-vfpv4
deleted file mode 100644
index a7f37134ba..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3
deleted file mode 100644
index 3fbb9aa49a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3d16
deleted file mode 100644
index 8cd70f7bcd..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7veb-vfpv4d16
deleted file mode 100644
index 709bcf9e6d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf b/scripts/tune/env.fake-cortexa75.armv7vehf
deleted file mode 100644
index a0f28da825..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf-neon b/scripts/tune/env.fake-cortexa75.armv7vehf-neon
deleted file mode 100644
index 8c5f5ba80b..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vehf-neon-vfpv4
deleted file mode 100644
index 5fedd32e1d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3
deleted file mode 100644
index 1aed3ed31e..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3d16
deleted file mode 100644
index ed18d39335..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv4d16
deleted file mode 100644
index acc5861b2c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb b/scripts/tune/env.fake-cortexa75.armv7vehfb
deleted file mode 100644
index 076c7d2eea..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb-neon b/scripts/tune/env.fake-cortexa75.armv7vehfb-neon
deleted file mode 100644
index df9dd6b48c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vehfb-neon-vfpv4
deleted file mode 100644
index b7f63eda18..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3
deleted file mode 100644
index e1c6ed2303..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3d16
deleted file mode 100644
index 6fa814079f..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv4d16
deleted file mode 100644
index a9812afe00..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet b/scripts/tune/env.fake-cortexa75.armv7vet
deleted file mode 100644
index 7f59574bcc..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet-neon b/scripts/tune/env.fake-cortexa75.armv7vet-neon
deleted file mode 100644
index be859dfb90..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vet-neon-vfpv4
deleted file mode 100644
index 6bc0781dfd..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3
deleted file mode 100644
index 3ae29e822a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3d16
deleted file mode 100644
index e0b672dec9..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vet-vfpv4d16
deleted file mode 100644
index ff2f6af551..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb b/scripts/tune/env.fake-cortexa75.armv7vetb
deleted file mode 100644
index c6c2a59526..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb-neon b/scripts/tune/env.fake-cortexa75.armv7vetb-neon
deleted file mode 100644
index acb4dfdf83..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vetb-neon-vfpv4
deleted file mode 100644
index 706481153d..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3
deleted file mode 100644
index 94c41b9be9..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3d16
deleted file mode 100644
index 694b1c5a4f..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv4d16
deleted file mode 100644
index 4fd5562fe3..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf b/scripts/tune/env.fake-cortexa75.armv7vethf
deleted file mode 100644
index 373dcb0736..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf-neon b/scripts/tune/env.fake-cortexa75.armv7vethf-neon
deleted file mode 100644
index 102f734cab..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vethf-neon-vfpv4
deleted file mode 100644
index 8648f052df..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3
deleted file mode 100644
index f275165f65..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3d16
deleted file mode 100644
index 8cd8211552..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv4d16
deleted file mode 100644
index dd05f3c898..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb b/scripts/tune/env.fake-cortexa75.armv7vethfb
deleted file mode 100644
index 1a280369d4..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb-neon b/scripts/tune/env.fake-cortexa75.armv7vethfb-neon
deleted file mode 100644
index 5584f9a339..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa75.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 73d4d23588..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3
deleted file mode 100644
index a8403e8450..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3d16
deleted file mode 100644
index 62e1c18434..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv4d16
deleted file mode 100644
index ec4592933a..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa75"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8-2a b/scripts/tune/env.fake-cortexa75.armv8-2a
deleted file mode 100644
index 37de67eaf4..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa75"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8-2a-crypto b/scripts/tune/env.fake-cortexa75.armv8-2a-crypto
deleted file mode 100644
index 0d30758805..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa75"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8a b/scripts/tune/env.fake-cortexa75.armv8a
deleted file mode 100644
index 954fb7897c..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa75"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8a-crc b/scripts/tune/env.fake-cortexa75.armv8a-crc
deleted file mode 100644
index 6a4f480961..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa75"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa75.armv8a-crc-crypto
deleted file mode 100644
index ae6877b3d7..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa75"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.armv8a-crypto b/scripts/tune/env.fake-cortexa75.armv8a-crypto
deleted file mode 100644
index d1b34035cd..0000000000
--- a/scripts/tune/env.fake-cortexa75.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa75"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa75.cortexa75 b/scripts/tune/env.fake-cortexa75.cortexa75
deleted file mode 100644
index 1636675560..0000000000
--- a/scripts/tune/env.fake-cortexa75.cortexa75
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa75 fake_cortexa75"
-TUNE_CCARGS=" -mcpu=cortex-a75 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa75"
-TUNE_PKGARCH="cortexa75"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a75 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76 b/scripts/tune/env.fake-cortexa76
deleted file mode 100644
index 99b5323ec9..0000000000
--- a/scripts/tune/env.fake-cortexa76
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa76"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa76 fake_cortexa76"
-TUNE_CCARGS=" -mcpu=cortex-a76 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa76"
-TUNE_PKGARCH="cortexa76"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55 b/scripts/tune/env.fake-cortexa76-cortexa55
deleted file mode 100644
index f88afc0e9a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa76-cortexa55 cortexa76-cortexa55-crypto"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a cortexa76-cortexa55 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa76-cortexa55"
-TUNE_PKGARCH="cortexa76-cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.aarch64 b/scripts/tune/env.fake-cortexa76-cortexa55.aarch64
deleted file mode 100644
index 275148f8d5..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa76_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.aarch64_be b/scripts/tune/env.fake-cortexa76-cortexa55.aarch64_be
deleted file mode 100644
index 82c3b6af7d..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa76_cortexa55"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv4
deleted file mode 100644
index adfe1c506a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv4b b/scripts/tune/env.fake-cortexa76-cortexa55.armv4b
deleted file mode 100644
index 975a62c6b9..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv4t b/scripts/tune/env.fake-cortexa76-cortexa55.armv4t
deleted file mode 100644
index 91095849ef..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv4tb b/scripts/tune/env.fake-cortexa76-cortexa55.armv4tb
deleted file mode 100644
index 8eb5c4d790..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5 b/scripts/tune/env.fake-cortexa76-cortexa55.armv5
deleted file mode 100644
index 6794822cdd..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5-vfp
deleted file mode 100644
index 7de4a793c8..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5b b/scripts/tune/env.fake-cortexa76-cortexa55.armv5b
deleted file mode 100644
index 4b7ea3479a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5b-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5b-vfp
deleted file mode 100644
index 14298f2f21..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5e b/scripts/tune/env.fake-cortexa76-cortexa55.armv5e
deleted file mode 100644
index da1db875c2..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5e-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5e-vfp
deleted file mode 100644
index ac8323e983..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb b/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb
deleted file mode 100644
index 5bbe395154..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb-vfp
deleted file mode 100644
index f8cdf3e30e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehf-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehf-vfp
deleted file mode 100644
index 7fecdb7e39..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehfb-vfp
deleted file mode 100644
index 4294678d99..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5hf-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5hf-vfp
deleted file mode 100644
index d481c9f2f5..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5hfb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5hfb-vfp
deleted file mode 100644
index 4b73106c45..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5t b/scripts/tune/env.fake-cortexa76-cortexa55.armv5t
deleted file mode 100644
index 6be1c22ff7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5t-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5t-vfp
deleted file mode 100644
index fa9ea1f27c..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb b/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb
deleted file mode 100644
index 8d1f92b8ec..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb-vfp
deleted file mode 100644
index 15af281627..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5te b/scripts/tune/env.fake-cortexa76-cortexa55.armv5te
deleted file mode 100644
index 92a589b5b7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5te-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5te-vfp
deleted file mode 100644
index e9f29f82bc..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb b/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb
deleted file mode 100644
index 220b7facd7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb-vfp
deleted file mode 100644
index 20459f25ab..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehf-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehf-vfp
deleted file mode 100644
index 38dbad47f2..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehfb-vfp
deleted file mode 100644
index 20f85ffc14..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5thf-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5thf-vfp
deleted file mode 100644
index 66a847674f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv5thfb-vfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv5thfb-vfp
deleted file mode 100644
index 36af85bcb9..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6 b/scripts/tune/env.fake-cortexa76-cortexa55.armv6
deleted file mode 100644
index b3038cfa87..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6-novfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv6-novfp
deleted file mode 100644
index 73d9164432..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6b b/scripts/tune/env.fake-cortexa76-cortexa55.armv6b
deleted file mode 100644
index d514cf5df3..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6b-novfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv6b-novfp
deleted file mode 100644
index d9aeff02a3..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6hf b/scripts/tune/env.fake-cortexa76-cortexa55.armv6hf
deleted file mode 100644
index 72cc53e1d7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6hfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv6hfb
deleted file mode 100644
index 25f8ff82af..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6t b/scripts/tune/env.fake-cortexa76-cortexa55.armv6t
deleted file mode 100644
index b3f010ef38..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6t-novfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv6t-novfp
deleted file mode 100644
index 99b0ea7947..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb b/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb
deleted file mode 100644
index 8c415dae61..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb-novfp b/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb-novfp
deleted file mode 100644
index 1bb6c580f2..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6thf b/scripts/tune/env.fake-cortexa76-cortexa55.armv6thf
deleted file mode 100644
index e27da8b63b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv6thfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv6thfb
deleted file mode 100644
index fd7241bed1..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a
deleted file mode 100644
index 801804a62a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon
deleted file mode 100644
index 20a198d79a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon-vfpv4
deleted file mode 100644
index 355d7f5e23..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3
deleted file mode 100644
index c80b1489a5..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3d16
deleted file mode 100644
index 4b3c26760c..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv4d16
deleted file mode 100644
index d315dd37be..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab
deleted file mode 100644
index 311b6767fd..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon
deleted file mode 100644
index d53e327e24..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon-vfpv4
deleted file mode 100644
index e40bdd439f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3
deleted file mode 100644
index 9d96fe3e01..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3d16
deleted file mode 100644
index d88987c502..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv4d16
deleted file mode 100644
index f4149b7d1b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf
deleted file mode 100644
index 425df36b5a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon
deleted file mode 100644
index f73506aa2e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon-vfpv4
deleted file mode 100644
index ce29e7bd22..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3
deleted file mode 100644
index d187163453..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3d16
deleted file mode 100644
index cadf5c7364..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv4d16
deleted file mode 100644
index 0a865120ce..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb
deleted file mode 100644
index 569d8009f9..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon
deleted file mode 100644
index d3315f8330..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 6c4dee653e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3
deleted file mode 100644
index dc3382a8d3..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3d16
deleted file mode 100644
index 4c0c98e5ba..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv4d16
deleted file mode 100644
index 525e2f024b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at
deleted file mode 100644
index 9087a3f9eb..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon
deleted file mode 100644
index 477fea223d..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon-vfpv4
deleted file mode 100644
index 7685bdf98c..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3
deleted file mode 100644
index 465fcd0abf..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3d16
deleted file mode 100644
index d3a2121c14..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv4d16
deleted file mode 100644
index 216804bef0..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb
deleted file mode 100644
index 70d8c34788..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon
deleted file mode 100644
index fd92a49397..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon-vfpv4
deleted file mode 100644
index 91115e7631..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3
deleted file mode 100644
index df4baba81a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3d16
deleted file mode 100644
index 39c1f851ae..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv4d16
deleted file mode 100644
index 33e84195cf..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf
deleted file mode 100644
index b288e26961..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon
deleted file mode 100644
index 26b19a9f87..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon-vfpv4
deleted file mode 100644
index 3db255f5d4..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3
deleted file mode 100644
index b922ce0b51..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3d16
deleted file mode 100644
index cce417a3c2..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv4d16
deleted file mode 100644
index 81e18d63a1..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb
deleted file mode 100644
index 0979946f5d..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon
deleted file mode 100644
index 58dd419660..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon-vfpv4
deleted file mode 100644
index 79a487b207..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3
deleted file mode 100644
index ec8108a9ff..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3d16
deleted file mode 100644
index b6f24f010f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv4d16
deleted file mode 100644
index fb1565ab9a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve
deleted file mode 100644
index e152dbb7d4..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon
deleted file mode 100644
index c2cbb53245..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon-vfpv4
deleted file mode 100644
index b1d885d9f4..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3
deleted file mode 100644
index 91ac83a0a8..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3d16
deleted file mode 100644
index fbf1512f5e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv4d16
deleted file mode 100644
index d8a5d7d64f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb
deleted file mode 100644
index 6aec2ce130..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon
deleted file mode 100644
index afc4cab4cc..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon-vfpv4
deleted file mode 100644
index 45d2320cf8..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3
deleted file mode 100644
index 9e41f3f5b7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3d16
deleted file mode 100644
index 9b16738e2b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv4d16
deleted file mode 100644
index 88b05bb51a..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf
deleted file mode 100644
index c90ac02eb5..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon
deleted file mode 100644
index 0f2499397d..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon-vfpv4
deleted file mode 100644
index 20249bcc76..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3
deleted file mode 100644
index 1e6f161790..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3d16
deleted file mode 100644
index 376cda6917..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv4d16
deleted file mode 100644
index 2b8284e1c2..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb
deleted file mode 100644
index 931a4c8777..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon
deleted file mode 100644
index 457bb1a491..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 0466975e55..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3
deleted file mode 100644
index 00fb03439e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3d16
deleted file mode 100644
index 39eaf1e906..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv4d16
deleted file mode 100644
index e5908af724..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet
deleted file mode 100644
index bdb2cb50bc..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon
deleted file mode 100644
index 1ece144870..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon-vfpv4
deleted file mode 100644
index c588bcd40f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3
deleted file mode 100644
index 58c19e08c4..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3d16
deleted file mode 100644
index 7da97028cd..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv4d16
deleted file mode 100644
index 1467eb2f09..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb
deleted file mode 100644
index abdfea95ec..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon
deleted file mode 100644
index f3da12ce35..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon-vfpv4
deleted file mode 100644
index 7b528d9c3b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3
deleted file mode 100644
index 67251de76f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3d16
deleted file mode 100644
index b491aa6daa..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv4d16
deleted file mode 100644
index 76242e7316..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf
deleted file mode 100644
index 4cc59ef47f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon
deleted file mode 100644
index 2add634591..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon-vfpv4
deleted file mode 100644
index 4c0ff79842..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3
deleted file mode 100644
index 8be6f334a7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3d16
deleted file mode 100644
index 93af00a285..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv4d16
deleted file mode 100644
index 27a18e417b..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb
deleted file mode 100644
index 822c50bf63..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon
deleted file mode 100644
index d907a5a41e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon-vfpv4
deleted file mode 100644
index c93c6d5221..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3
deleted file mode 100644
index 3498c20b9e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3d16
deleted file mode 100644
index 5fe6ab5959..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv4d16
deleted file mode 100644
index 528f94a146..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a b/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a
deleted file mode 100644
index 35536ef8da..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a-crypto b/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a-crypto
deleted file mode 100644
index 2e736900c7..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a b/scripts/tune/env.fake-cortexa76-cortexa55.armv8a
deleted file mode 100644
index 7bcd313cba..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc b/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc
deleted file mode 100644
index f5ca6b5678..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc-crypto
deleted file mode 100644
index 56ce336d87..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crypto b/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crypto
deleted file mode 100644
index e03b42f00f..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55 b/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55
deleted file mode 100644
index 4a97deaf27..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a cortexa76-cortexa55 fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa76-cortexa55"
-TUNE_PKGARCH="cortexa76-cortexa55"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55-crypto b/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55-crypto
deleted file mode 100644
index 6c2c99383e..0000000000
--- a/scripts/tune/env.fake-cortexa76-cortexa55.cortexa76-cortexa55-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa76-cortexa55 cortexa76-cortexa55-crypto fake_cortexa76_cortexa55"
-TUNE_CCARGS=" -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a cortexa76-cortexa55 crypto"
-TUNE_PKGARCH="cortexa76-cortexa55-crypto"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76.cortex-a55 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.aarch64 b/scripts/tune/env.fake-cortexa76.aarch64
deleted file mode 100644
index 70e5a31a16..0000000000
--- a/scripts/tune/env.fake-cortexa76.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa76"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.aarch64_be b/scripts/tune/env.fake-cortexa76.aarch64_be
deleted file mode 100644
index 6e31d4767d..0000000000
--- a/scripts/tune/env.fake-cortexa76.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa76"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv4 b/scripts/tune/env.fake-cortexa76.armv4
deleted file mode 100644
index 3602e7104e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv4b b/scripts/tune/env.fake-cortexa76.armv4b
deleted file mode 100644
index ecfef77ad6..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa76"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv4t b/scripts/tune/env.fake-cortexa76.armv4t
deleted file mode 100644
index 37e71ea5d5..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa76"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv4tb b/scripts/tune/env.fake-cortexa76.armv4tb
deleted file mode 100644
index c4e744cf9f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa76"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5 b/scripts/tune/env.fake-cortexa76.armv5
deleted file mode 100644
index 47687aa1e7..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5-vfp b/scripts/tune/env.fake-cortexa76.armv5-vfp
deleted file mode 100644
index 5dae6fa467..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5b b/scripts/tune/env.fake-cortexa76.armv5b
deleted file mode 100644
index 0046989929..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5b-vfp b/scripts/tune/env.fake-cortexa76.armv5b-vfp
deleted file mode 100644
index b333559dd7..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5e b/scripts/tune/env.fake-cortexa76.armv5e
deleted file mode 100644
index f5da644be7..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5e-vfp b/scripts/tune/env.fake-cortexa76.armv5e-vfp
deleted file mode 100644
index 49bd49e757..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5eb b/scripts/tune/env.fake-cortexa76.armv5eb
deleted file mode 100644
index 28d30994fc..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5eb-vfp b/scripts/tune/env.fake-cortexa76.armv5eb-vfp
deleted file mode 100644
index 98d6b2bc92..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5ehf-vfp b/scripts/tune/env.fake-cortexa76.armv5ehf-vfp
deleted file mode 100644
index 6afe491f6c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa76.armv5ehfb-vfp
deleted file mode 100644
index 80611b8275..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5hf-vfp b/scripts/tune/env.fake-cortexa76.armv5hf-vfp
deleted file mode 100644
index d3a7e05ac4..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5hfb-vfp b/scripts/tune/env.fake-cortexa76.armv5hfb-vfp
deleted file mode 100644
index ffae33f6c9..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5t b/scripts/tune/env.fake-cortexa76.armv5t
deleted file mode 100644
index 162aefc9a3..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5t-vfp b/scripts/tune/env.fake-cortexa76.armv5t-vfp
deleted file mode 100644
index 751ed4e0fc..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5tb b/scripts/tune/env.fake-cortexa76.armv5tb
deleted file mode 100644
index c251342c52..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5tb-vfp b/scripts/tune/env.fake-cortexa76.armv5tb-vfp
deleted file mode 100644
index 0058b06190..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5te b/scripts/tune/env.fake-cortexa76.armv5te
deleted file mode 100644
index 1b31faa991..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5te-vfp b/scripts/tune/env.fake-cortexa76.armv5te-vfp
deleted file mode 100644
index 86f7f6e29b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5teb b/scripts/tune/env.fake-cortexa76.armv5teb
deleted file mode 100644
index f4d3f0a125..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5teb-vfp b/scripts/tune/env.fake-cortexa76.armv5teb-vfp
deleted file mode 100644
index da46be5db5..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5tehf-vfp b/scripts/tune/env.fake-cortexa76.armv5tehf-vfp
deleted file mode 100644
index 154c9f510d..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa76.armv5tehfb-vfp
deleted file mode 100644
index 917d45c53b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5thf-vfp b/scripts/tune/env.fake-cortexa76.armv5thf-vfp
deleted file mode 100644
index 133f66f828..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv5thfb-vfp b/scripts/tune/env.fake-cortexa76.armv5thfb-vfp
deleted file mode 100644
index 03536b9049..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6 b/scripts/tune/env.fake-cortexa76.armv6
deleted file mode 100644
index c56f4f08b1..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6-novfp b/scripts/tune/env.fake-cortexa76.armv6-novfp
deleted file mode 100644
index f27085d477..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa76"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6b b/scripts/tune/env.fake-cortexa76.armv6b
deleted file mode 100644
index 395afaf0b4..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6b-novfp b/scripts/tune/env.fake-cortexa76.armv6b-novfp
deleted file mode 100644
index 28d18f6e4c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa76"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6hf b/scripts/tune/env.fake-cortexa76.armv6hf
deleted file mode 100644
index d4982b06bb..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6hfb b/scripts/tune/env.fake-cortexa76.armv6hfb
deleted file mode 100644
index d08f7a36bf..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6t b/scripts/tune/env.fake-cortexa76.armv6t
deleted file mode 100644
index 2c04b84ec1..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6t-novfp b/scripts/tune/env.fake-cortexa76.armv6t-novfp
deleted file mode 100644
index a6333f7fb3..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6tb b/scripts/tune/env.fake-cortexa76.armv6tb
deleted file mode 100644
index 55cfc5cba9..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6tb-novfp b/scripts/tune/env.fake-cortexa76.armv6tb-novfp
deleted file mode 100644
index 1ff86edcff..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6thf b/scripts/tune/env.fake-cortexa76.armv6thf
deleted file mode 100644
index 2ae7a97a8d..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv6thfb b/scripts/tune/env.fake-cortexa76.armv6thfb
deleted file mode 100644
index 61fe97c36c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a b/scripts/tune/env.fake-cortexa76.armv7a
deleted file mode 100644
index 8995677d7f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a-neon b/scripts/tune/env.fake-cortexa76.armv7a-neon
deleted file mode 100644
index 0d61745764..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7a-neon-vfpv4
deleted file mode 100644
index 1f0229c255..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7a-vfpv3
deleted file mode 100644
index c63c3963de..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7a-vfpv3d16
deleted file mode 100644
index 996161e1f2..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7a-vfpv4d16
deleted file mode 100644
index 609a0477d9..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab b/scripts/tune/env.fake-cortexa76.armv7ab
deleted file mode 100644
index 15ee5cc31c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab-neon b/scripts/tune/env.fake-cortexa76.armv7ab-neon
deleted file mode 100644
index 3d1759db4a..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7ab-neon-vfpv4
deleted file mode 100644
index d9860731a7..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3
deleted file mode 100644
index 922fabd6b3..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3d16
deleted file mode 100644
index 6f815cfe13..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7ab-vfpv4d16
deleted file mode 100644
index 4d868fed59..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf b/scripts/tune/env.fake-cortexa76.armv7ahf
deleted file mode 100644
index 157e257944..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf-neon b/scripts/tune/env.fake-cortexa76.armv7ahf-neon
deleted file mode 100644
index 973479f743..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7ahf-neon-vfpv4
deleted file mode 100644
index c032dcecb6..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3
deleted file mode 100644
index 2ac8fb6e66..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3d16
deleted file mode 100644
index 88c0e4ae1b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv4d16
deleted file mode 100644
index 54bd1ef9cd..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb b/scripts/tune/env.fake-cortexa76.armv7ahfb
deleted file mode 100644
index c416e11749..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb-neon b/scripts/tune/env.fake-cortexa76.armv7ahfb-neon
deleted file mode 100644
index 5def7cd0fd..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 00f42213ba..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3
deleted file mode 100644
index 32d6b1cf02..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3d16
deleted file mode 100644
index c9699c841a..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv4d16
deleted file mode 100644
index c4d9fc2cea..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at b/scripts/tune/env.fake-cortexa76.armv7at
deleted file mode 100644
index 73e0ea49ea..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at-neon b/scripts/tune/env.fake-cortexa76.armv7at-neon
deleted file mode 100644
index b169192975..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7at-neon-vfpv4
deleted file mode 100644
index 3d8109ef3a..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7at-vfpv3
deleted file mode 100644
index 83c8043448..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7at-vfpv3d16
deleted file mode 100644
index 91401ff012..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7at-vfpv4d16
deleted file mode 100644
index 4d22904386..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb b/scripts/tune/env.fake-cortexa76.armv7atb
deleted file mode 100644
index ccf7004c0c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb-neon b/scripts/tune/env.fake-cortexa76.armv7atb-neon
deleted file mode 100644
index 548c2f5eaa..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7atb-neon-vfpv4
deleted file mode 100644
index 25676d8c3f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3
deleted file mode 100644
index 3890a9e8e2..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3d16
deleted file mode 100644
index 8523553bd2..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7atb-vfpv4d16
deleted file mode 100644
index f195f1155e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf b/scripts/tune/env.fake-cortexa76.armv7athf
deleted file mode 100644
index 7c5a29eff9..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf-neon b/scripts/tune/env.fake-cortexa76.armv7athf-neon
deleted file mode 100644
index 98affa718f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7athf-neon-vfpv4
deleted file mode 100644
index 59d901f0e2..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3
deleted file mode 100644
index 61ee20fb0d..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3d16
deleted file mode 100644
index c6b849e9a5..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7athf-vfpv4d16
deleted file mode 100644
index e2ccd3e19e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb b/scripts/tune/env.fake-cortexa76.armv7athfb
deleted file mode 100644
index d51e7f9ccb..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb-neon b/scripts/tune/env.fake-cortexa76.armv7athfb-neon
deleted file mode 100644
index de2ed7b6bd..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7athfb-neon-vfpv4
deleted file mode 100644
index 2070e8d169..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3
deleted file mode 100644
index a9b6acc85e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3d16
deleted file mode 100644
index 89bcabd273..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv4d16
deleted file mode 100644
index 793fb5ae0e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve b/scripts/tune/env.fake-cortexa76.armv7ve
deleted file mode 100644
index 114aa64c85..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve-neon b/scripts/tune/env.fake-cortexa76.armv7ve-neon
deleted file mode 100644
index 5de972fdd8..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7ve-neon-vfpv4
deleted file mode 100644
index 354186f366..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3
deleted file mode 100644
index 5bd4cf2ad6..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3d16
deleted file mode 100644
index 5e7d0732a1..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7ve-vfpv4d16
deleted file mode 100644
index d43cf06421..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb b/scripts/tune/env.fake-cortexa76.armv7veb
deleted file mode 100644
index a968495c5d..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb-neon b/scripts/tune/env.fake-cortexa76.armv7veb-neon
deleted file mode 100644
index e9aee96ded..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7veb-neon-vfpv4
deleted file mode 100644
index e2f3ac0d4f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3
deleted file mode 100644
index 4fdeda322b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3d16
deleted file mode 100644
index 779238383b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7veb-vfpv4d16
deleted file mode 100644
index f8044e5b59..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf b/scripts/tune/env.fake-cortexa76.armv7vehf
deleted file mode 100644
index f2a4f196ee..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf-neon b/scripts/tune/env.fake-cortexa76.armv7vehf-neon
deleted file mode 100644
index 3468330bb9..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vehf-neon-vfpv4
deleted file mode 100644
index 00ea1dc67e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3
deleted file mode 100644
index 30379e488f..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3d16
deleted file mode 100644
index 6fe97bef1a..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv4d16
deleted file mode 100644
index 63050b917c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb b/scripts/tune/env.fake-cortexa76.armv7vehfb
deleted file mode 100644
index 9424ec0e90..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb-neon b/scripts/tune/env.fake-cortexa76.armv7vehfb-neon
deleted file mode 100644
index 1ad151d0f2..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 0bc6bf0a6a..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3
deleted file mode 100644
index 1fb3d8756e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3d16
deleted file mode 100644
index 050c6b7274..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv4d16
deleted file mode 100644
index 340db634f1..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet b/scripts/tune/env.fake-cortexa76.armv7vet
deleted file mode 100644
index 9061f349db..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet-neon b/scripts/tune/env.fake-cortexa76.armv7vet-neon
deleted file mode 100644
index 64f7beb584..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vet-neon-vfpv4
deleted file mode 100644
index b3208177a3..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3
deleted file mode 100644
index 25262d438e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3d16
deleted file mode 100644
index 955f9a6f7b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vet-vfpv4d16
deleted file mode 100644
index c8514c4d9e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb b/scripts/tune/env.fake-cortexa76.armv7vetb
deleted file mode 100644
index 1b95d485fe..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb-neon b/scripts/tune/env.fake-cortexa76.armv7vetb-neon
deleted file mode 100644
index 9ab7c13e82..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vetb-neon-vfpv4
deleted file mode 100644
index 115a5b438e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3
deleted file mode 100644
index 58552e56ad..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3d16
deleted file mode 100644
index 7083634d7c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv4d16
deleted file mode 100644
index aeb18b3888..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf b/scripts/tune/env.fake-cortexa76.armv7vethf
deleted file mode 100644
index 9b057b0f53..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf-neon b/scripts/tune/env.fake-cortexa76.armv7vethf-neon
deleted file mode 100644
index 3637b34e8c..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vethf-neon-vfpv4
deleted file mode 100644
index fb133cf445..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3
deleted file mode 100644
index b4bd6bed45..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3d16
deleted file mode 100644
index 15b62f0cb4..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv4d16
deleted file mode 100644
index 1de8024c2b..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb b/scripts/tune/env.fake-cortexa76.armv7vethfb
deleted file mode 100644
index 265c34d6ed..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb-neon b/scripts/tune/env.fake-cortexa76.armv7vethfb-neon
deleted file mode 100644
index a473d960f4..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 934581f3b1..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3
deleted file mode 100644
index 6174ec65d3..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3d16
deleted file mode 100644
index 351de0b6e6..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv4d16
deleted file mode 100644
index 8e537633f5..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa76"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8-2a b/scripts/tune/env.fake-cortexa76.armv8-2a
deleted file mode 100644
index 3377eb21f4..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa76"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8-2a-crypto b/scripts/tune/env.fake-cortexa76.armv8-2a-crypto
deleted file mode 100644
index 1103f2f6be..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa76"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8a b/scripts/tune/env.fake-cortexa76.armv8a
deleted file mode 100644
index 9c7a829197..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa76"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8a-crc b/scripts/tune/env.fake-cortexa76.armv8a-crc
deleted file mode 100644
index fbc1fe6408..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa76"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa76.armv8a-crc-crypto
deleted file mode 100644
index 04e7a917e8..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa76"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.armv8a-crypto b/scripts/tune/env.fake-cortexa76.armv8a-crypto
deleted file mode 100644
index 97ff79622e..0000000000
--- a/scripts/tune/env.fake-cortexa76.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa76"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76.cortexa76 b/scripts/tune/env.fake-cortexa76.cortexa76
deleted file mode 100644
index c1b028e11c..0000000000
--- a/scripts/tune/env.fake-cortexa76.cortexa76
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa76 fake_cortexa76"
-TUNE_CCARGS=" -mcpu=cortex-a76 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa76"
-TUNE_PKGARCH="cortexa76"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae b/scripts/tune/env.fake-cortexa76ae
deleted file mode 100644
index 9ea78a35d2..0000000000
--- a/scripts/tune/env.fake-cortexa76ae
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa76ae"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa76ae fake_cortexa76ae"
-TUNE_CCARGS=" -mcpu=cortex-a76ae -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa76ae"
-TUNE_PKGARCH="cortexa76ae"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76ae -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.aarch64 b/scripts/tune/env.fake-cortexa76ae.aarch64
deleted file mode 100644
index 3f5e8fb9c7..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa76ae"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.aarch64_be b/scripts/tune/env.fake-cortexa76ae.aarch64_be
deleted file mode 100644
index e4d5dd9284..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa76ae"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv4 b/scripts/tune/env.fake-cortexa76ae.armv4
deleted file mode 100644
index 925e9439a2..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv4b b/scripts/tune/env.fake-cortexa76ae.armv4b
deleted file mode 100644
index 4e564b163d..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv4t b/scripts/tune/env.fake-cortexa76ae.armv4t
deleted file mode 100644
index e8473d7c0a..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv4tb b/scripts/tune/env.fake-cortexa76ae.armv4tb
deleted file mode 100644
index a454f8acfa..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5 b/scripts/tune/env.fake-cortexa76ae.armv5
deleted file mode 100644
index 1f56a576e4..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5-vfp b/scripts/tune/env.fake-cortexa76ae.armv5-vfp
deleted file mode 100644
index a8da9c8237..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5b b/scripts/tune/env.fake-cortexa76ae.armv5b
deleted file mode 100644
index c7baefe07e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5b-vfp b/scripts/tune/env.fake-cortexa76ae.armv5b-vfp
deleted file mode 100644
index 8edd162b0d..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5e b/scripts/tune/env.fake-cortexa76ae.armv5e
deleted file mode 100644
index 629a1b3dc7..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5e-vfp b/scripts/tune/env.fake-cortexa76ae.armv5e-vfp
deleted file mode 100644
index cb4fc90ec7..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5eb b/scripts/tune/env.fake-cortexa76ae.armv5eb
deleted file mode 100644
index 717a0c2747..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5eb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5eb-vfp
deleted file mode 100644
index d57faf66f8..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5ehf-vfp b/scripts/tune/env.fake-cortexa76ae.armv5ehf-vfp
deleted file mode 100644
index 76f8176e0c..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5ehfb-vfp
deleted file mode 100644
index 8988a7b562..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5hf-vfp b/scripts/tune/env.fake-cortexa76ae.armv5hf-vfp
deleted file mode 100644
index 2308dcbb83..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5hfb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5hfb-vfp
deleted file mode 100644
index 23cf770764..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5t b/scripts/tune/env.fake-cortexa76ae.armv5t
deleted file mode 100644
index 0707eb3f58..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5t-vfp b/scripts/tune/env.fake-cortexa76ae.armv5t-vfp
deleted file mode 100644
index 28dbaecee6..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5tb b/scripts/tune/env.fake-cortexa76ae.armv5tb
deleted file mode 100644
index 6b0a9f95df..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5tb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5tb-vfp
deleted file mode 100644
index 6c923b6f04..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5te b/scripts/tune/env.fake-cortexa76ae.armv5te
deleted file mode 100644
index e0906759cc..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5te-vfp b/scripts/tune/env.fake-cortexa76ae.armv5te-vfp
deleted file mode 100644
index b467728b25..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5teb b/scripts/tune/env.fake-cortexa76ae.armv5teb
deleted file mode 100644
index e1d073ca1b..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5teb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5teb-vfp
deleted file mode 100644
index 7cac147b4c..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5tehf-vfp b/scripts/tune/env.fake-cortexa76ae.armv5tehf-vfp
deleted file mode 100644
index 8691fe6884..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5tehfb-vfp
deleted file mode 100644
index 3383ba551d..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5thf-vfp b/scripts/tune/env.fake-cortexa76ae.armv5thf-vfp
deleted file mode 100644
index 5f5db8714e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv5thfb-vfp b/scripts/tune/env.fake-cortexa76ae.armv5thfb-vfp
deleted file mode 100644
index 0ab5cdc5c8..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6 b/scripts/tune/env.fake-cortexa76ae.armv6
deleted file mode 100644
index 2bb319e683..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6-novfp b/scripts/tune/env.fake-cortexa76ae.armv6-novfp
deleted file mode 100644
index f505fa914a..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6b b/scripts/tune/env.fake-cortexa76ae.armv6b
deleted file mode 100644
index 4308b2918d..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6b-novfp b/scripts/tune/env.fake-cortexa76ae.armv6b-novfp
deleted file mode 100644
index 6f97d33b5d..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6hf b/scripts/tune/env.fake-cortexa76ae.armv6hf
deleted file mode 100644
index de03010ca6..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6hfb b/scripts/tune/env.fake-cortexa76ae.armv6hfb
deleted file mode 100644
index 93e4a414db..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6t b/scripts/tune/env.fake-cortexa76ae.armv6t
deleted file mode 100644
index 0740738034..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6t-novfp b/scripts/tune/env.fake-cortexa76ae.armv6t-novfp
deleted file mode 100644
index 2cbb4cdd87..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6tb b/scripts/tune/env.fake-cortexa76ae.armv6tb
deleted file mode 100644
index 25321f5b55..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6tb-novfp b/scripts/tune/env.fake-cortexa76ae.armv6tb-novfp
deleted file mode 100644
index 1b432943dc..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6thf b/scripts/tune/env.fake-cortexa76ae.armv6thf
deleted file mode 100644
index 131bcf6e9c..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv6thfb b/scripts/tune/env.fake-cortexa76ae.armv6thfb
deleted file mode 100644
index 687ed3c520..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a b/scripts/tune/env.fake-cortexa76ae.armv7a
deleted file mode 100644
index a81a89ec1a..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a-neon b/scripts/tune/env.fake-cortexa76ae.armv7a-neon
deleted file mode 100644
index fad2b9cee3..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7a-neon-vfpv4
deleted file mode 100644
index ec46cd9a97..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3
deleted file mode 100644
index 371349153c..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3d16
deleted file mode 100644
index f90414e838..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv4d16
deleted file mode 100644
index 78dad1ddd5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab b/scripts/tune/env.fake-cortexa76ae.armv7ab
deleted file mode 100644
index a33a02a8a2..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab-neon b/scripts/tune/env.fake-cortexa76ae.armv7ab-neon
deleted file mode 100644
index 6d15b25a09..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7ab-neon-vfpv4
deleted file mode 100644
index 00694162f0..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3
deleted file mode 100644
index b5ed255985..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3d16
deleted file mode 100644
index 23b90e84f5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv4d16
deleted file mode 100644
index 8f71b0cf40..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf b/scripts/tune/env.fake-cortexa76ae.armv7ahf
deleted file mode 100644
index fe13f15cee..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon b/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon
deleted file mode 100644
index 50a8f384ae..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon-vfpv4
deleted file mode 100644
index b253789b93..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3
deleted file mode 100644
index 6040b03225..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3d16
deleted file mode 100644
index 6bfc63fa90..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv4d16
deleted file mode 100644
index 7111f09698..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb b/scripts/tune/env.fake-cortexa76ae.armv7ahfb
deleted file mode 100644
index ce1a47c9c3..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon b/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon
deleted file mode 100644
index 60cf43a96f..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon-vfpv4
deleted file mode 100644
index c3284e333b..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3
deleted file mode 100644
index f19e7843d5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3d16
deleted file mode 100644
index 1121146e32..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv4d16
deleted file mode 100644
index 2ebd66e2b5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at b/scripts/tune/env.fake-cortexa76ae.armv7at
deleted file mode 100644
index 094f897fcd..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at-neon b/scripts/tune/env.fake-cortexa76ae.armv7at-neon
deleted file mode 100644
index 5b9efba8a5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7at-neon-vfpv4
deleted file mode 100644
index 172317a3f4..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3
deleted file mode 100644
index ed7d019bf0..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3d16
deleted file mode 100644
index 4bc424514f..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv4d16
deleted file mode 100644
index 27ebaca7ab..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb b/scripts/tune/env.fake-cortexa76ae.armv7atb
deleted file mode 100644
index a42ff8b0f7..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb-neon b/scripts/tune/env.fake-cortexa76ae.armv7atb-neon
deleted file mode 100644
index 66e6b27209..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7atb-neon-vfpv4
deleted file mode 100644
index e9c61f7ca2..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3
deleted file mode 100644
index f390eef971..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3d16
deleted file mode 100644
index 9ee9d8d304..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv4d16
deleted file mode 100644
index fb8297d2f1..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf b/scripts/tune/env.fake-cortexa76ae.armv7athf
deleted file mode 100644
index 60abbea773..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf-neon b/scripts/tune/env.fake-cortexa76ae.armv7athf-neon
deleted file mode 100644
index f5d13d4502..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7athf-neon-vfpv4
deleted file mode 100644
index f76678a621..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3
deleted file mode 100644
index ecef2c45d8..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3d16
deleted file mode 100644
index 1249afedf0..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv4d16
deleted file mode 100644
index 322eefee91..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb b/scripts/tune/env.fake-cortexa76ae.armv7athfb
deleted file mode 100644
index 3eb85c86a9..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon b/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon
deleted file mode 100644
index 19096d2202..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon-vfpv4
deleted file mode 100644
index ccf1c5d262..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3
deleted file mode 100644
index 3f12adfb11..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3d16
deleted file mode 100644
index 5a100c9e91..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv4d16
deleted file mode 100644
index 5f214eee2b..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve b/scripts/tune/env.fake-cortexa76ae.armv7ve
deleted file mode 100644
index 002189279e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve-neon b/scripts/tune/env.fake-cortexa76ae.armv7ve-neon
deleted file mode 100644
index 8243bd9d14..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7ve-neon-vfpv4
deleted file mode 100644
index 7701ec2018..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3
deleted file mode 100644
index f90b24caeb..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3d16
deleted file mode 100644
index a9bd905ff0..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv4d16
deleted file mode 100644
index 143222af82..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb b/scripts/tune/env.fake-cortexa76ae.armv7veb
deleted file mode 100644
index f34150d919..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb-neon b/scripts/tune/env.fake-cortexa76ae.armv7veb-neon
deleted file mode 100644
index 390f7bf4fc..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7veb-neon-vfpv4
deleted file mode 100644
index c3ddd4d767..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3
deleted file mode 100644
index 790261fd56..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3d16
deleted file mode 100644
index 3a4e8ebba5..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv4d16
deleted file mode 100644
index c7ba42700f..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf b/scripts/tune/env.fake-cortexa76ae.armv7vehf
deleted file mode 100644
index 48cd7c839f..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon b/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon
deleted file mode 100644
index 4dcd29ab32..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon-vfpv4
deleted file mode 100644
index 82c02a784e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3
deleted file mode 100644
index b668b547fa..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3d16
deleted file mode 100644
index b8226bfd54..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv4d16
deleted file mode 100644
index da94fcc909..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb b/scripts/tune/env.fake-cortexa76ae.armv7vehfb
deleted file mode 100644
index 3b5c3224ed..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon b/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon
deleted file mode 100644
index 9b5f272dac..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon-vfpv4
deleted file mode 100644
index 0bfdc72965..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3
deleted file mode 100644
index b18df11c6b..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3d16
deleted file mode 100644
index bc1c71759c..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv4d16
deleted file mode 100644
index 39e7ad76c2..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet b/scripts/tune/env.fake-cortexa76ae.armv7vet
deleted file mode 100644
index f840aefd2e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet-neon b/scripts/tune/env.fake-cortexa76ae.armv7vet-neon
deleted file mode 100644
index 14d2c19e20..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vet-neon-vfpv4
deleted file mode 100644
index b68e7ac48f..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3
deleted file mode 100644
index 737d6d1825..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3d16
deleted file mode 100644
index f979831002..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv4d16
deleted file mode 100644
index 300be0b990..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb b/scripts/tune/env.fake-cortexa76ae.armv7vetb
deleted file mode 100644
index a7e47844f3..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon b/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon
deleted file mode 100644
index 04dd130748..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon-vfpv4
deleted file mode 100644
index 1ca26a3c10..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3
deleted file mode 100644
index d27ab31f12..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3d16
deleted file mode 100644
index 590d74cf67..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv4d16
deleted file mode 100644
index 4ff81af093..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf b/scripts/tune/env.fake-cortexa76ae.armv7vethf
deleted file mode 100644
index fd22f23e43..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon b/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon
deleted file mode 100644
index ff9f932489..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon-vfpv4
deleted file mode 100644
index ab465905e6..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3
deleted file mode 100644
index 66549937d1..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3d16
deleted file mode 100644
index 2733e4f494..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv4d16
deleted file mode 100644
index 96075b8122..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb b/scripts/tune/env.fake-cortexa76ae.armv7vethfb
deleted file mode 100644
index bd8134129e..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon b/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon
deleted file mode 100644
index 9fa5e02329..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon-vfpv4
deleted file mode 100644
index b0ef144332..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3
deleted file mode 100644
index 4c740ec683..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3d16
deleted file mode 100644
index e3ae44309a..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv4d16
deleted file mode 100644
index 940b279bcf..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8-2a b/scripts/tune/env.fake-cortexa76ae.armv8-2a
deleted file mode 100644
index b84854f4a4..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8-2a-crypto b/scripts/tune/env.fake-cortexa76ae.armv8-2a-crypto
deleted file mode 100644
index 32f5bbd2ce..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8a b/scripts/tune/env.fake-cortexa76ae.armv8a
deleted file mode 100644
index 41cc118c41..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8a-crc b/scripts/tune/env.fake-cortexa76ae.armv8a-crc
deleted file mode 100644
index 07ebef070b..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa76ae.armv8a-crc-crypto
deleted file mode 100644
index 7ac8526a0a..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.armv8a-crypto b/scripts/tune/env.fake-cortexa76ae.armv8a-crypto
deleted file mode 100644
index c41ae4adee..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa76ae"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa76ae.cortexa76ae b/scripts/tune/env.fake-cortexa76ae.cortexa76ae
deleted file mode 100644
index 585af3f9ab..0000000000
--- a/scripts/tune/env.fake-cortexa76ae.cortexa76ae
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa76ae fake_cortexa76ae"
-TUNE_CCARGS=" -mcpu=cortex-a76ae -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa76ae"
-TUNE_PKGARCH="cortexa76ae"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a76ae -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77 b/scripts/tune/env.fake-cortexa77
deleted file mode 100644
index d6a393cc75..0000000000
--- a/scripts/tune/env.fake-cortexa77
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto cortexa77"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa77 fake_cortexa77"
-TUNE_CCARGS=" -mcpu=cortex-a77 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa77"
-TUNE_PKGARCH="cortexa77"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a77 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.aarch64 b/scripts/tune/env.fake-cortexa77.aarch64
deleted file mode 100644
index 77705ed07e..0000000000
--- a/scripts/tune/env.fake-cortexa77.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_cortexa77"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.aarch64_be b/scripts/tune/env.fake-cortexa77.aarch64_be
deleted file mode 100644
index 724752b378..0000000000
--- a/scripts/tune/env.fake-cortexa77.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_cortexa77"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv4 b/scripts/tune/env.fake-cortexa77.armv4
deleted file mode 100644
index fbf37acffe..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv4b b/scripts/tune/env.fake-cortexa77.armv4b
deleted file mode 100644
index 258becc9bd..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_cortexa77"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv4t b/scripts/tune/env.fake-cortexa77.armv4t
deleted file mode 100644
index 3e3f805ae1..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_cortexa77"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv4tb b/scripts/tune/env.fake-cortexa77.armv4tb
deleted file mode 100644
index 292f9de632..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_cortexa77"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5 b/scripts/tune/env.fake-cortexa77.armv5
deleted file mode 100644
index 84b0f7fd85..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5-vfp b/scripts/tune/env.fake-cortexa77.armv5-vfp
deleted file mode 100644
index d4ac27cc52..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5b b/scripts/tune/env.fake-cortexa77.armv5b
deleted file mode 100644
index b00ef7d8c3..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5b-vfp b/scripts/tune/env.fake-cortexa77.armv5b-vfp
deleted file mode 100644
index 514e4a53b9..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5e b/scripts/tune/env.fake-cortexa77.armv5e
deleted file mode 100644
index a8d37731d1..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5e-vfp b/scripts/tune/env.fake-cortexa77.armv5e-vfp
deleted file mode 100644
index f5f418a69b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5eb b/scripts/tune/env.fake-cortexa77.armv5eb
deleted file mode 100644
index 1ad38a28c1..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5eb-vfp b/scripts/tune/env.fake-cortexa77.armv5eb-vfp
deleted file mode 100644
index f4c60cb180..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5ehf-vfp b/scripts/tune/env.fake-cortexa77.armv5ehf-vfp
deleted file mode 100644
index 06952584a8..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5ehfb-vfp b/scripts/tune/env.fake-cortexa77.armv5ehfb-vfp
deleted file mode 100644
index fe8e11f4d9..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5hf-vfp b/scripts/tune/env.fake-cortexa77.armv5hf-vfp
deleted file mode 100644
index 4bb9c40bb2..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5hfb-vfp b/scripts/tune/env.fake-cortexa77.armv5hfb-vfp
deleted file mode 100644
index 5407207fec..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5t b/scripts/tune/env.fake-cortexa77.armv5t
deleted file mode 100644
index 9b0e404dc0..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5t-vfp b/scripts/tune/env.fake-cortexa77.armv5t-vfp
deleted file mode 100644
index e62b9d70ce..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5tb b/scripts/tune/env.fake-cortexa77.armv5tb
deleted file mode 100644
index ed47bd3e84..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5tb-vfp b/scripts/tune/env.fake-cortexa77.armv5tb-vfp
deleted file mode 100644
index 8cdaca1f91..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5te b/scripts/tune/env.fake-cortexa77.armv5te
deleted file mode 100644
index 793988411e..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5te-vfp b/scripts/tune/env.fake-cortexa77.armv5te-vfp
deleted file mode 100644
index 7e6f43b108..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5teb b/scripts/tune/env.fake-cortexa77.armv5teb
deleted file mode 100644
index afce71a389..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5teb-vfp b/scripts/tune/env.fake-cortexa77.armv5teb-vfp
deleted file mode 100644
index a07ebedac0..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5tehf-vfp b/scripts/tune/env.fake-cortexa77.armv5tehf-vfp
deleted file mode 100644
index 9e0d46ed47..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5tehfb-vfp b/scripts/tune/env.fake-cortexa77.armv5tehfb-vfp
deleted file mode 100644
index d8cf361ad4..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5thf-vfp b/scripts/tune/env.fake-cortexa77.armv5thf-vfp
deleted file mode 100644
index ee6c6b33d1..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv5thfb-vfp b/scripts/tune/env.fake-cortexa77.armv5thfb-vfp
deleted file mode 100644
index 9c66e2c496..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6 b/scripts/tune/env.fake-cortexa77.armv6
deleted file mode 100644
index 4a32eb9b12..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6-novfp b/scripts/tune/env.fake-cortexa77.armv6-novfp
deleted file mode 100644
index 18e4b7abf4..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_cortexa77"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6b b/scripts/tune/env.fake-cortexa77.armv6b
deleted file mode 100644
index 2ff27a99f3..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6b-novfp b/scripts/tune/env.fake-cortexa77.armv6b-novfp
deleted file mode 100644
index 5a90f383cb..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_cortexa77"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6hf b/scripts/tune/env.fake-cortexa77.armv6hf
deleted file mode 100644
index befc9f2488..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6hfb b/scripts/tune/env.fake-cortexa77.armv6hfb
deleted file mode 100644
index fb61b3bd4c..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6t b/scripts/tune/env.fake-cortexa77.armv6t
deleted file mode 100644
index e4b7cc1d5b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6t-novfp b/scripts/tune/env.fake-cortexa77.armv6t-novfp
deleted file mode 100644
index 2a3dca87e4..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6tb b/scripts/tune/env.fake-cortexa77.armv6tb
deleted file mode 100644
index 0d393d6fac..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6tb-novfp b/scripts/tune/env.fake-cortexa77.armv6tb-novfp
deleted file mode 100644
index c1688e1735..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6thf b/scripts/tune/env.fake-cortexa77.armv6thf
deleted file mode 100644
index 3cd2ea9c49..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv6thfb b/scripts/tune/env.fake-cortexa77.armv6thfb
deleted file mode 100644
index 91283eca8b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a b/scripts/tune/env.fake-cortexa77.armv7a
deleted file mode 100644
index ac83cf1624..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a-neon b/scripts/tune/env.fake-cortexa77.armv7a-neon
deleted file mode 100644
index fc24966b9b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7a-neon-vfpv4
deleted file mode 100644
index d2d70e1711..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7a-vfpv3
deleted file mode 100644
index 14c17b2875..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7a-vfpv3d16
deleted file mode 100644
index f1d72c59b1..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7a-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7a-vfpv4d16
deleted file mode 100644
index 7a93cd7ac8..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab b/scripts/tune/env.fake-cortexa77.armv7ab
deleted file mode 100644
index f1a6159791..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab-neon b/scripts/tune/env.fake-cortexa77.armv7ab-neon
deleted file mode 100644
index f437c701c0..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7ab-neon-vfpv4
deleted file mode 100644
index acfc2656cc..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3
deleted file mode 100644
index eb7a48b6ec..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3d16
deleted file mode 100644
index ad4b98bab7..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7ab-vfpv4d16
deleted file mode 100644
index 5717dc0fb6..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf b/scripts/tune/env.fake-cortexa77.armv7ahf
deleted file mode 100644
index 1d6261baa6..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf-neon b/scripts/tune/env.fake-cortexa77.armv7ahf-neon
deleted file mode 100644
index baeffee2f7..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7ahf-neon-vfpv4
deleted file mode 100644
index a03c4fcebd..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3
deleted file mode 100644
index 52941cab69..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3d16
deleted file mode 100644
index ed930d7471..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv4d16
deleted file mode 100644
index f7c277c652..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb b/scripts/tune/env.fake-cortexa77.armv7ahfb
deleted file mode 100644
index 461d9c616f..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb-neon b/scripts/tune/env.fake-cortexa77.armv7ahfb-neon
deleted file mode 100644
index 3f3fe7baa2..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 84830b62fa..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3
deleted file mode 100644
index 4135ff850a..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3d16
deleted file mode 100644
index f5166c8e5d..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv4d16
deleted file mode 100644
index f2298357a0..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at b/scripts/tune/env.fake-cortexa77.armv7at
deleted file mode 100644
index 42fd48c55d..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at-neon b/scripts/tune/env.fake-cortexa77.armv7at-neon
deleted file mode 100644
index bfaec7d8a3..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7at-neon-vfpv4
deleted file mode 100644
index 6addb51d4b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7at-vfpv3
deleted file mode 100644
index 6aec5e2e71..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7at-vfpv3d16
deleted file mode 100644
index 6bf83ad186..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7at-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7at-vfpv4d16
deleted file mode 100644
index 8adfbd99c2..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb b/scripts/tune/env.fake-cortexa77.armv7atb
deleted file mode 100644
index f38246f25b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb-neon b/scripts/tune/env.fake-cortexa77.armv7atb-neon
deleted file mode 100644
index ea3d2b20c5..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7atb-neon-vfpv4
deleted file mode 100644
index 5fac5470ea..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3
deleted file mode 100644
index c20e43e855..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3d16
deleted file mode 100644
index dba0d86f69..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7atb-vfpv4d16
deleted file mode 100644
index 1b652c7bfe..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf b/scripts/tune/env.fake-cortexa77.armv7athf
deleted file mode 100644
index e604aabcf6..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf-neon b/scripts/tune/env.fake-cortexa77.armv7athf-neon
deleted file mode 100644
index 027c1b58db..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7athf-neon-vfpv4
deleted file mode 100644
index 952ad79f3c..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3
deleted file mode 100644
index 1382f9fc4b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3d16
deleted file mode 100644
index f00d8d4d71..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7athf-vfpv4d16
deleted file mode 100644
index 7bbfab8ead..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb b/scripts/tune/env.fake-cortexa77.armv7athfb
deleted file mode 100644
index 6c0b1fa68a..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb-neon b/scripts/tune/env.fake-cortexa77.armv7athfb-neon
deleted file mode 100644
index dcd6d0bca2..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7athfb-neon-vfpv4
deleted file mode 100644
index 6b5c09f665..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3
deleted file mode 100644
index 4e68fca1ad..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3d16
deleted file mode 100644
index 55015f5f4d..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv4d16
deleted file mode 100644
index 183f445a12..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve b/scripts/tune/env.fake-cortexa77.armv7ve
deleted file mode 100644
index 27a541f2df..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve-neon b/scripts/tune/env.fake-cortexa77.armv7ve-neon
deleted file mode 100644
index eccff577dd..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7ve-neon-vfpv4
deleted file mode 100644
index 856267b903..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3
deleted file mode 100644
index 699ad6e800..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3d16
deleted file mode 100644
index 77b6800e9e..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7ve-vfpv4d16
deleted file mode 100644
index 6b5d0fff55..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb b/scripts/tune/env.fake-cortexa77.armv7veb
deleted file mode 100644
index eedec6f351..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb-neon b/scripts/tune/env.fake-cortexa77.armv7veb-neon
deleted file mode 100644
index 9aaca38c3d..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7veb-neon-vfpv4
deleted file mode 100644
index c28e14bc95..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3
deleted file mode 100644
index 2abe4bd988..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3d16
deleted file mode 100644
index ee8bea8ae4..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7veb-vfpv4d16
deleted file mode 100644
index 578613620f..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf b/scripts/tune/env.fake-cortexa77.armv7vehf
deleted file mode 100644
index 65a12b2ac9..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf-neon b/scripts/tune/env.fake-cortexa77.armv7vehf-neon
deleted file mode 100644
index c82b4c5604..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vehf-neon-vfpv4
deleted file mode 100644
index 2779c78196..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3
deleted file mode 100644
index 344a7386f8..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3d16
deleted file mode 100644
index 7d38b23cc9..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv4d16
deleted file mode 100644
index 6d2ca3d00b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb b/scripts/tune/env.fake-cortexa77.armv7vehfb
deleted file mode 100644
index dc17b7c669..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb-neon b/scripts/tune/env.fake-cortexa77.armv7vehfb-neon
deleted file mode 100644
index ad1063e4cd..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vehfb-neon-vfpv4
deleted file mode 100644
index eb0e995ce0..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3
deleted file mode 100644
index 3ad1be8227..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3d16
deleted file mode 100644
index c0833a6731..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv4d16
deleted file mode 100644
index b6a0fb30fb..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet b/scripts/tune/env.fake-cortexa77.armv7vet
deleted file mode 100644
index 9aa7261cd6..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet-neon b/scripts/tune/env.fake-cortexa77.armv7vet-neon
deleted file mode 100644
index fdc76e33c6..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vet-neon-vfpv4
deleted file mode 100644
index 59147bdc66..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3
deleted file mode 100644
index 4e55687a1b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3d16
deleted file mode 100644
index 7300744e3c..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vet-vfpv4d16
deleted file mode 100644
index 6b991d0a06..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb b/scripts/tune/env.fake-cortexa77.armv7vetb
deleted file mode 100644
index d0f726fee5..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb-neon b/scripts/tune/env.fake-cortexa77.armv7vetb-neon
deleted file mode 100644
index 0d387bd339..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vetb-neon-vfpv4
deleted file mode 100644
index aef5afb810..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3
deleted file mode 100644
index e9ec6b8086..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3d16
deleted file mode 100644
index 37a6f1220b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv4d16
deleted file mode 100644
index a6ca2fb2c7..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf b/scripts/tune/env.fake-cortexa77.armv7vethf
deleted file mode 100644
index 6ab328b1ed..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf-neon b/scripts/tune/env.fake-cortexa77.armv7vethf-neon
deleted file mode 100644
index 0714b953a7..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vethf-neon-vfpv4
deleted file mode 100644
index 196530ec29..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3
deleted file mode 100644
index 782fb8079b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3d16
deleted file mode 100644
index f530111d8d..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv4d16
deleted file mode 100644
index 6ac69e447a..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb b/scripts/tune/env.fake-cortexa77.armv7vethfb
deleted file mode 100644
index 5aab649ace..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb-neon b/scripts/tune/env.fake-cortexa77.armv7vethfb-neon
deleted file mode 100644
index c4f7dce65e..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-cortexa77.armv7vethfb-neon-vfpv4
deleted file mode 100644
index c88874b07a..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3 b/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3
deleted file mode 100644
index f25bb06cd7..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3d16
deleted file mode 100644
index f38f014992..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv4d16
deleted file mode 100644
index c9d47c3657..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_cortexa77"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8-2a b/scripts/tune/env.fake-cortexa77.armv8-2a
deleted file mode 100644
index e9871dd21b..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_cortexa77"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8-2a-crypto b/scripts/tune/env.fake-cortexa77.armv8-2a-crypto
deleted file mode 100644
index ad555f45e3..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_cortexa77"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8a b/scripts/tune/env.fake-cortexa77.armv8a
deleted file mode 100644
index 2ae0760bdb..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_cortexa77"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8a-crc b/scripts/tune/env.fake-cortexa77.armv8a-crc
deleted file mode 100644
index 059e4dc694..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_cortexa77"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8a-crc-crypto b/scripts/tune/env.fake-cortexa77.armv8a-crc-crypto
deleted file mode 100644
index 620b3814ca..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_cortexa77"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.armv8a-crypto b/scripts/tune/env.fake-cortexa77.armv8a-crypto
deleted file mode 100644
index 997e3b0b45..0000000000
--- a/scripts/tune/env.fake-cortexa77.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_cortexa77"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-cortexa77.cortexa77 b/scripts/tune/env.fake-cortexa77.cortexa77
deleted file mode 100644
index 8500bbbe8e..0000000000
--- a/scripts/tune/env.fake-cortexa77.cortexa77
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto cortexa77 fake_cortexa77"
-TUNE_CCARGS=" -mcpu=cortex-a77 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto cortexa77"
-TUNE_PKGARCH="cortexa77"
-export CC="aarch64-oe-linux-gcc -mcpu=cortex-a77 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-ep9312.armv4t b/scripts/tune/env.fake-ep9312.armv4t
index f1d7088b86..de7873947e 100644
--- a/scripts/tune/env.fake-ep9312.armv4t
+++ b/scripts/tune/env.fake-ep9312.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_ep9312"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-ep9312.armv4tb b/scripts/tune/env.fake-ep9312.armv4tb
index 1877718fa2..f7f1dd29a0 100644
--- a/scripts/tune/env.fake-ep9312.armv4tb
+++ b/scripts/tune/env.fake-ep9312.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_ep9312"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv4t b/scripts/tune/env.fake-iwmmxt.armv4t
index c49ec734f9..0bbf413db9 100644
--- a/scripts/tune/env.fake-iwmmxt.armv4t
+++ b/scripts/tune/env.fake-iwmmxt.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_iwmmxt"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv4tb b/scripts/tune/env.fake-iwmmxt.armv4tb
index 73f4552422..f068fa5233 100644
--- a/scripts/tune/env.fake-iwmmxt.armv4tb
+++ b/scripts/tune/env.fake-iwmmxt.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5t b/scripts/tune/env.fake-iwmmxt.armv5t
index 72566da524..be60b03cb1 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5t
+++ b/scripts/tune/env.fake-iwmmxt.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5t-vfp b/scripts/tune/env.fake-iwmmxt.armv5t-vfp
index 3e253b15a1..af32a6fd8c 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5t-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tb b/scripts/tune/env.fake-iwmmxt.armv5tb
index 3a4aa90cab..cdfe022590 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tb
+++ b/scripts/tune/env.fake-iwmmxt.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tb-vfp b/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
index 21a8c11290..f86c6a8b79 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5te b/scripts/tune/env.fake-iwmmxt.armv5te
index f2e0cef570..552bdd637c 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5te
+++ b/scripts/tune/env.fake-iwmmxt.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5te-vfp b/scripts/tune/env.fake-iwmmxt.armv5te-vfp
index e5480f39a6..77bb2cda9b 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5te-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5teb b/scripts/tune/env.fake-iwmmxt.armv5teb
index 250f2a35bb..9b963ce3cb 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5teb
+++ b/scripts/tune/env.fake-iwmmxt.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5teb-vfp b/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
index 4e6b4f8da9..93411f3fea 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp b/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
index 5756a0f23f..ebcaabf228 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp b/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
index aaedb3df11..19f8e4af53 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5thf-vfp b/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
index f9c677ec36..ab08c6a45d 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp b/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
index 28082858c6..1d12669ed1 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1 b/scripts/tune/env.fake-neoversee1
deleted file mode 100644
index 6af2139e17..0000000000
--- a/scripts/tune/env.fake-neoversee1
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto neoversee1"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto neoversee1 fake_neoversee1"
-TUNE_CCARGS=" -mcpu=neoverse-e1 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto neoversee1"
-TUNE_PKGARCH="neoversee1"
-export CC="aarch64-oe-linux-gcc -mcpu=neoverse-e1 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.aarch64 b/scripts/tune/env.fake-neoversee1.aarch64
deleted file mode 100644
index eb2dfbf66b..0000000000
--- a/scripts/tune/env.fake-neoversee1.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_neoversee1"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.aarch64_be b/scripts/tune/env.fake-neoversee1.aarch64_be
deleted file mode 100644
index e805b9cbc1..0000000000
--- a/scripts/tune/env.fake-neoversee1.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_neoversee1"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv4 b/scripts/tune/env.fake-neoversee1.armv4
deleted file mode 100644
index e2817797d7..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv4b b/scripts/tune/env.fake-neoversee1.armv4b
deleted file mode 100644
index f05cdff98e..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_neoversee1"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv4t b/scripts/tune/env.fake-neoversee1.armv4t
deleted file mode 100644
index cad0e87a2f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_neoversee1"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv4tb b/scripts/tune/env.fake-neoversee1.armv4tb
deleted file mode 100644
index 88759944c2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_neoversee1"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5 b/scripts/tune/env.fake-neoversee1.armv5
deleted file mode 100644
index 3b2e54e964..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5-vfp b/scripts/tune/env.fake-neoversee1.armv5-vfp
deleted file mode 100644
index 42a99b2de2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5b b/scripts/tune/env.fake-neoversee1.armv5b
deleted file mode 100644
index 856050d580..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5b-vfp b/scripts/tune/env.fake-neoversee1.armv5b-vfp
deleted file mode 100644
index 295ef5f39d..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5e b/scripts/tune/env.fake-neoversee1.armv5e
deleted file mode 100644
index 3943c8c977..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5e-vfp b/scripts/tune/env.fake-neoversee1.armv5e-vfp
deleted file mode 100644
index cf28bc7f72..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5eb b/scripts/tune/env.fake-neoversee1.armv5eb
deleted file mode 100644
index 4bd29cb8b6..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5eb-vfp b/scripts/tune/env.fake-neoversee1.armv5eb-vfp
deleted file mode 100644
index 1facc58de8..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5ehf-vfp b/scripts/tune/env.fake-neoversee1.armv5ehf-vfp
deleted file mode 100644
index 791e04a340..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5ehfb-vfp b/scripts/tune/env.fake-neoversee1.armv5ehfb-vfp
deleted file mode 100644
index ae1b90c44e..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5hf-vfp b/scripts/tune/env.fake-neoversee1.armv5hf-vfp
deleted file mode 100644
index 91dc0b4940..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5hfb-vfp b/scripts/tune/env.fake-neoversee1.armv5hfb-vfp
deleted file mode 100644
index 4d6fa03b43..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5t b/scripts/tune/env.fake-neoversee1.armv5t
deleted file mode 100644
index 7eb568b2f9..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5t-vfp b/scripts/tune/env.fake-neoversee1.armv5t-vfp
deleted file mode 100644
index 7fe3f517c6..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5tb b/scripts/tune/env.fake-neoversee1.armv5tb
deleted file mode 100644
index a51ea14c69..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5tb-vfp b/scripts/tune/env.fake-neoversee1.armv5tb-vfp
deleted file mode 100644
index c0122710dd..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5te b/scripts/tune/env.fake-neoversee1.armv5te
deleted file mode 100644
index 8d7247d332..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5te-vfp b/scripts/tune/env.fake-neoversee1.armv5te-vfp
deleted file mode 100644
index 32c7e54f9d..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5teb b/scripts/tune/env.fake-neoversee1.armv5teb
deleted file mode 100644
index 321b763bfa..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5teb-vfp b/scripts/tune/env.fake-neoversee1.armv5teb-vfp
deleted file mode 100644
index bd6546e9aa..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5tehf-vfp b/scripts/tune/env.fake-neoversee1.armv5tehf-vfp
deleted file mode 100644
index 3c7828889b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5tehfb-vfp b/scripts/tune/env.fake-neoversee1.armv5tehfb-vfp
deleted file mode 100644
index d48629c69e..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5thf-vfp b/scripts/tune/env.fake-neoversee1.armv5thf-vfp
deleted file mode 100644
index 87555885c0..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv5thfb-vfp b/scripts/tune/env.fake-neoversee1.armv5thfb-vfp
deleted file mode 100644
index 5fcefe99a9..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6 b/scripts/tune/env.fake-neoversee1.armv6
deleted file mode 100644
index 745ed15f90..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6-novfp b/scripts/tune/env.fake-neoversee1.armv6-novfp
deleted file mode 100644
index cc4c0fe467..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_neoversee1"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6b b/scripts/tune/env.fake-neoversee1.armv6b
deleted file mode 100644
index 49e4d74f1f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6b-novfp b/scripts/tune/env.fake-neoversee1.armv6b-novfp
deleted file mode 100644
index c8301e88e1..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_neoversee1"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6hf b/scripts/tune/env.fake-neoversee1.armv6hf
deleted file mode 100644
index b87ee9c70a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6hfb b/scripts/tune/env.fake-neoversee1.armv6hfb
deleted file mode 100644
index 43718b8d47..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6t b/scripts/tune/env.fake-neoversee1.armv6t
deleted file mode 100644
index 6ec89adaaa..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6t-novfp b/scripts/tune/env.fake-neoversee1.armv6t-novfp
deleted file mode 100644
index fcacbd9d2c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6tb b/scripts/tune/env.fake-neoversee1.armv6tb
deleted file mode 100644
index d943d812b4..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6tb-novfp b/scripts/tune/env.fake-neoversee1.armv6tb-novfp
deleted file mode 100644
index 4cfec5438d..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6thf b/scripts/tune/env.fake-neoversee1.armv6thf
deleted file mode 100644
index 086c921a70..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv6thfb b/scripts/tune/env.fake-neoversee1.armv6thfb
deleted file mode 100644
index b16886ae56..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a b/scripts/tune/env.fake-neoversee1.armv7a
deleted file mode 100644
index f32083c4f8..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a-neon b/scripts/tune/env.fake-neoversee1.armv7a-neon
deleted file mode 100644
index b4bc2c4467..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7a-neon-vfpv4
deleted file mode 100644
index d10b63ae0b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7a-vfpv3
deleted file mode 100644
index a25ea59f69..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7a-vfpv3d16
deleted file mode 100644
index 39216f13ce..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7a-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7a-vfpv4d16
deleted file mode 100644
index 051d26528e..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab b/scripts/tune/env.fake-neoversee1.armv7ab
deleted file mode 100644
index ef23f4acbc..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab-neon b/scripts/tune/env.fake-neoversee1.armv7ab-neon
deleted file mode 100644
index 197da036d5..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7ab-neon-vfpv4
deleted file mode 100644
index 7c21ba9b0b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3
deleted file mode 100644
index 8e5085cdbf..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3d16
deleted file mode 100644
index dde227f364..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7ab-vfpv4d16
deleted file mode 100644
index d8ba36473c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf b/scripts/tune/env.fake-neoversee1.armv7ahf
deleted file mode 100644
index 396349689a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf-neon b/scripts/tune/env.fake-neoversee1.armv7ahf-neon
deleted file mode 100644
index 88d817658b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7ahf-neon-vfpv4
deleted file mode 100644
index 30b9c084f9..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3
deleted file mode 100644
index 16e96f1010..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3d16
deleted file mode 100644
index 3655ec1216..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv4d16
deleted file mode 100644
index 2564211a58..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb b/scripts/tune/env.fake-neoversee1.armv7ahfb
deleted file mode 100644
index b7a25cae2a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb-neon b/scripts/tune/env.fake-neoversee1.armv7ahfb-neon
deleted file mode 100644
index 669f09f544..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 5d965c4b28..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3
deleted file mode 100644
index 1e0104d3de..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3d16
deleted file mode 100644
index b8bdf893b2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv4d16
deleted file mode 100644
index 06d237ef67..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at b/scripts/tune/env.fake-neoversee1.armv7at
deleted file mode 100644
index d2856dc2fd..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at-neon b/scripts/tune/env.fake-neoversee1.armv7at-neon
deleted file mode 100644
index 3f8befd745..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7at-neon-vfpv4
deleted file mode 100644
index 7b978d4835..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7at-vfpv3
deleted file mode 100644
index 1308e4ac73..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7at-vfpv3d16
deleted file mode 100644
index 9d77304d41..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7at-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7at-vfpv4d16
deleted file mode 100644
index 362f023b97..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb b/scripts/tune/env.fake-neoversee1.armv7atb
deleted file mode 100644
index 0a11e2f835..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb-neon b/scripts/tune/env.fake-neoversee1.armv7atb-neon
deleted file mode 100644
index 946e4707bf..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7atb-neon-vfpv4
deleted file mode 100644
index 37ebcd1a52..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3
deleted file mode 100644
index 978c960755..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3d16
deleted file mode 100644
index 4568179728..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7atb-vfpv4d16
deleted file mode 100644
index 588f5c0998..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf b/scripts/tune/env.fake-neoversee1.armv7athf
deleted file mode 100644
index 9b0599bf55..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf-neon b/scripts/tune/env.fake-neoversee1.armv7athf-neon
deleted file mode 100644
index c71407ef3b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7athf-neon-vfpv4
deleted file mode 100644
index efd2652c09..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3
deleted file mode 100644
index e708500463..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3d16
deleted file mode 100644
index 1e7a26b482..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7athf-vfpv4d16
deleted file mode 100644
index 1dac93eacf..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb b/scripts/tune/env.fake-neoversee1.armv7athfb
deleted file mode 100644
index 27399f4a93..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb-neon b/scripts/tune/env.fake-neoversee1.armv7athfb-neon
deleted file mode 100644
index a65ecad0f7..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7athfb-neon-vfpv4
deleted file mode 100644
index 2df9ad55c0..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3
deleted file mode 100644
index 9b3e9e3de6..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3d16
deleted file mode 100644
index 3bc52e5677..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv4d16
deleted file mode 100644
index 684154b74c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve b/scripts/tune/env.fake-neoversee1.armv7ve
deleted file mode 100644
index a9a6ad2db3..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve-neon b/scripts/tune/env.fake-neoversee1.armv7ve-neon
deleted file mode 100644
index d93dfb629b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7ve-neon-vfpv4
deleted file mode 100644
index 1fe0870257..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3
deleted file mode 100644
index 2f5951f8e6..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3d16
deleted file mode 100644
index b321f22acd..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7ve-vfpv4d16
deleted file mode 100644
index 3f77ccbca2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb b/scripts/tune/env.fake-neoversee1.armv7veb
deleted file mode 100644
index cdc00af058..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb-neon b/scripts/tune/env.fake-neoversee1.armv7veb-neon
deleted file mode 100644
index cb5e7b6a6b..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7veb-neon-vfpv4
deleted file mode 100644
index 1197f74a05..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3
deleted file mode 100644
index 00edcdb04f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3d16
deleted file mode 100644
index dcfc954d45..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7veb-vfpv4d16
deleted file mode 100644
index a2219fa933..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf b/scripts/tune/env.fake-neoversee1.armv7vehf
deleted file mode 100644
index 09d096bec2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf-neon b/scripts/tune/env.fake-neoversee1.armv7vehf-neon
deleted file mode 100644
index 410e4d4dd9..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vehf-neon-vfpv4
deleted file mode 100644
index 3f08ccee7f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3
deleted file mode 100644
index 82614a97d3..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3d16
deleted file mode 100644
index 20878b1c84..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv4d16
deleted file mode 100644
index 0dd8673d9f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb b/scripts/tune/env.fake-neoversee1.armv7vehfb
deleted file mode 100644
index be2d6514d3..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb-neon b/scripts/tune/env.fake-neoversee1.armv7vehfb-neon
deleted file mode 100644
index 80b1536cbc..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vehfb-neon-vfpv4
deleted file mode 100644
index d9a5b13955..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3
deleted file mode 100644
index 6386e1e5c4..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3d16
deleted file mode 100644
index dcde71482f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv4d16
deleted file mode 100644
index 8081933d19..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet b/scripts/tune/env.fake-neoversee1.armv7vet
deleted file mode 100644
index 1970ad6b79..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet-neon b/scripts/tune/env.fake-neoversee1.armv7vet-neon
deleted file mode 100644
index 4a5f070ecf..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vet-neon-vfpv4
deleted file mode 100644
index 09f22d49bf..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3
deleted file mode 100644
index b3379903a0..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3d16
deleted file mode 100644
index 84c325f0b4..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vet-vfpv4d16
deleted file mode 100644
index 51ff51f5a8..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb b/scripts/tune/env.fake-neoversee1.armv7vetb
deleted file mode 100644
index c0958efcc0..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb-neon b/scripts/tune/env.fake-neoversee1.armv7vetb-neon
deleted file mode 100644
index 54e6a5c26a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vetb-neon-vfpv4
deleted file mode 100644
index 644f3475ab..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3
deleted file mode 100644
index 9cc07ead36..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3d16
deleted file mode 100644
index 2a2401be70..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv4d16
deleted file mode 100644
index 5d613c9493..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf b/scripts/tune/env.fake-neoversee1.armv7vethf
deleted file mode 100644
index 8b3b29fea9..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf-neon b/scripts/tune/env.fake-neoversee1.armv7vethf-neon
deleted file mode 100644
index a2d376fd5c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vethf-neon-vfpv4
deleted file mode 100644
index 1b2ad64a5c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3
deleted file mode 100644
index c12520229c..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3d16
deleted file mode 100644
index 6ffa1235d2..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv4d16
deleted file mode 100644
index ea93c74b79..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb b/scripts/tune/env.fake-neoversee1.armv7vethfb
deleted file mode 100644
index 7251cbeaa4..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb-neon b/scripts/tune/env.fake-neoversee1.armv7vethfb-neon
deleted file mode 100644
index 0dec141f8e..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-neoversee1.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 3c90b8ff97..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3 b/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3
deleted file mode 100644
index 8de0ce2618..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3d16
deleted file mode 100644
index 39c676a6e6..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv4d16
deleted file mode 100644
index 663ded5305..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_neoversee1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8-2a b/scripts/tune/env.fake-neoversee1.armv8-2a
deleted file mode 100644
index 75072b844f..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_neoversee1"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8-2a-crypto b/scripts/tune/env.fake-neoversee1.armv8-2a-crypto
deleted file mode 100644
index cba074515a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_neoversee1"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8a b/scripts/tune/env.fake-neoversee1.armv8a
deleted file mode 100644
index afd640a905..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_neoversee1"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8a-crc b/scripts/tune/env.fake-neoversee1.armv8a-crc
deleted file mode 100644
index dddef882f8..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_neoversee1"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8a-crc-crypto b/scripts/tune/env.fake-neoversee1.armv8a-crc-crypto
deleted file mode 100644
index c9898f233a..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_neoversee1"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.armv8a-crypto b/scripts/tune/env.fake-neoversee1.armv8a-crypto
deleted file mode 100644
index ce3c959340..0000000000
--- a/scripts/tune/env.fake-neoversee1.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_neoversee1"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversee1.neoversee1 b/scripts/tune/env.fake-neoversee1.neoversee1
deleted file mode 100644
index 40840aad19..0000000000
--- a/scripts/tune/env.fake-neoversee1.neoversee1
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto neoversee1 fake_neoversee1"
-TUNE_CCARGS=" -mcpu=neoverse-e1 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto neoversee1"
-TUNE_PKGARCH="neoversee1"
-export CC="aarch64-oe-linux-gcc -mcpu=neoverse-e1 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1 b/scripts/tune/env.fake-neoversen1
deleted file mode 100644
index 861d63bce1..0000000000
--- a/scripts/tune/env.fake-neoversen1
+++ /dev/null
@@ -1,8 +0,0 @@
-AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3 armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4 armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16 armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4 armv7ab armv7atb armv7ab-vfpv3d16 armv7atb-vfpv3d16 armv7ab-vfpv3 armv7atb-vfpv3 armv7ab-vfpv4d16 armv7atb-vfpv4d16 armv7ab-neon armv7atb-neon armv7ab-neon-vfpv4 armv7atb-neon-vfpv4 armv7ahfb armv7athfb armv7ahfb-vfpv3d16 armv7athfb-vfpv3d16 armv7ahfb-vfpv3 armv7athfb-vfpv3 armv7ahfb-vfpv4d16 armv7athfb-vfpv4d16 armv7ahfb-neon armv7athfb-neon armv7ahfb-neon-vfpv4 armv7athfb-neon-vfpv4 armv7ve armv7vet armv7ve-vfpv3d16 armv7vet-vfpv3d16 armv7ve-vfpv3 armv7vet-vfpv3 armv7ve-vfpv4d16 armv7vet-vfpv4d16 armv7ve-neon armv7vet-neon armv7ve-neon-vfpv4 armv7vet-neon-vfpv4 armv7vehf armv7vethf armv7vehf-vfpv3d16 armv7vethf-vfpv3d16 armv7vehf-vfpv3 armv7vethf-vfpv3 armv7vehf-vfpv4d16 armv7vethf-vfpv4d16 armv7vehf-neon armv7vethf-neon armv7vehf-neon-vfpv4 armv7vethf-neon-vfpv4 armv7veb armv7vetb armv7veb-vfpv3d16 armv7vetb-vfpv3d16 armv7veb-vfpv3 armv7vetb-vfpv3 armv7veb-vfpv4d16 armv7vetb-vfpv4d16 armv7veb-neon armv7vetb-neon armv7veb-neon-vfpv4 armv7vetb-neon-vfpv4 armv7vehfb armv7vethfb armv7vehfb-vfpv3d16 armv7vethfb-vfpv3d16 armv7vehfb-vfpv3 armv7vethfb-vfpv3 armv7vehfb-vfpv4d16 armv7vethfb-vfpv4d16 armv7vehfb-neon armv7vethfb-neon armv7vehfb-neon-vfpv4 armv7vethfb-neon-vfpv4 aarch64 aarch64_be armv8a armv8a-crc armv8a-crc-crypto armv8a-crypto armv8-2a armv8-2a-crypto neoversen1"
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto neoversen1 fake_neoversen1"
-TUNE_CCARGS=" -mcpu=neoverse-n1 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto neoversen1"
-TUNE_PKGARCH="neoversen1"
-export CC="aarch64-oe-linux-gcc -mcpu=neoverse-n1 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.aarch64 b/scripts/tune/env.fake-neoversen1.aarch64
deleted file mode 100644
index 001b0692fe..0000000000
--- a/scripts/tune/env.fake-neoversen1.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 fake_neoversen1"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64"
-TUNE_PKGARCH="aarch64"
-export CC="aarch64-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.aarch64_be b/scripts/tune/env.fake-neoversen1.aarch64_be
deleted file mode 100644
index d66615f89f..0000000000
--- a/scripts/tune/env.fake-neoversen1.aarch64_be
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64_be fake_neoversen1"
-TUNE_CCARGS=""
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 bigendian"
-TUNE_PKGARCH="aarch64_be"
-export CC="aarch64_be-oe-linux-gcc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv4 b/scripts/tune/env.fake-neoversen1.armv4
deleted file mode 100644
index 01048faf36..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv4b b/scripts/tune/env.fake-neoversen1.armv4b
deleted file mode 100644
index a6c90bca34..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv4b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b fake_neoversen1"
-TUNE_CCARGS=" -march=armv4t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv4t b/scripts/tune/env.fake-neoversen1.armv4t
deleted file mode 100644
index 0ce66ae232..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv4t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_neoversen1"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv4tb b/scripts/tune/env.fake-neoversen1.armv4tb
deleted file mode 100644
index e6000dc3da..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv4tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_neoversen1"
-TUNE_CCARGS=" -march=armv4t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5 b/scripts/tune/env.fake-neoversen1.armv5
deleted file mode 100644
index ea9516e509..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5-vfp b/scripts/tune/env.fake-neoversen1.armv5-vfp
deleted file mode 100644
index cf0040bc4c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5b b/scripts/tune/env.fake-neoversen1.armv5b
deleted file mode 100644
index 85bdb5b1ea..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5b-vfp b/scripts/tune/env.fake-neoversen1.armv5b-vfp
deleted file mode 100644
index e2ad455294..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5b-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5e b/scripts/tune/env.fake-neoversen1.armv5e
deleted file mode 100644
index 78de1da1df..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5e
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5e-vfp b/scripts/tune/env.fake-neoversen1.armv5e-vfp
deleted file mode 100644
index ed44c2d73a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5e-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5eb b/scripts/tune/env.fake-neoversen1.armv5eb
deleted file mode 100644
index 2a9cc27204..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5eb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5eb-vfp b/scripts/tune/env.fake-neoversen1.armv5eb-vfp
deleted file mode 100644
index 97e3e96c47..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5eb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5ehf-vfp b/scripts/tune/env.fake-neoversen1.armv5ehf-vfp
deleted file mode 100644
index 06d8100428..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5ehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5ehfb-vfp b/scripts/tune/env.fake-neoversen1.armv5ehfb-vfp
deleted file mode 100644
index f34c538125..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5ehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5hf-vfp b/scripts/tune/env.fake-neoversen1.armv5hf-vfp
deleted file mode 100644
index a68b9da223..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5hf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5hfb-vfp b/scripts/tune/env.fake-neoversen1.armv5hfb-vfp
deleted file mode 100644
index 2e5062b46c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5hfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5t b/scripts/tune/env.fake-neoversen1.armv5t
deleted file mode 100644
index 9728471646..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5t-vfp b/scripts/tune/env.fake-neoversen1.armv5t-vfp
deleted file mode 100644
index 3ecfc7d6be..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5t-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5tb b/scripts/tune/env.fake-neoversen1.armv5tb
deleted file mode 100644
index f843829e33..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5tb-vfp b/scripts/tune/env.fake-neoversen1.armv5tb-vfp
deleted file mode 100644
index 7a674a6748..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5tb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5te b/scripts/tune/env.fake-neoversen1.armv5te
deleted file mode 100644
index 0148eaec8a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5te
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5te-vfp b/scripts/tune/env.fake-neoversen1.armv5te-vfp
deleted file mode 100644
index 5543b83bb2..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5te-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5teb b/scripts/tune/env.fake-neoversen1.armv5teb
deleted file mode 100644
index d45be2c404..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5teb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5teb-vfp b/scripts/tune/env.fake-neoversen1.armv5teb-vfp
deleted file mode 100644
index 119e0d8b49..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5teb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5tehf-vfp b/scripts/tune/env.fake-neoversen1.armv5tehf-vfp
deleted file mode 100644
index bf21c9472a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5tehf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5tehfb-vfp b/scripts/tune/env.fake-neoversen1.armv5tehfb-vfp
deleted file mode 100644
index a0f1b9213e..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5tehfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5thf-vfp b/scripts/tune/env.fake-neoversen1.armv5thf-vfp
deleted file mode 100644
index b322c73c26..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5thf-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv5thfb-vfp b/scripts/tune/env.fake-neoversen1.armv5thfb-vfp
deleted file mode 100644
index e68a64ef48..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv5thfb-vfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6 b/scripts/tune/env.fake-neoversen1.armv6
deleted file mode 100644
index 24fb041384..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6-novfp b/scripts/tune/env.fake-neoversen1.armv6-novfp
deleted file mode 100644
index 4e22a6a29b..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5e armv6 fake_neoversen1"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6b b/scripts/tune/env.fake-neoversen1.armv6b
deleted file mode 100644
index a599db03d9..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6b
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6b-novfp b/scripts/tune/env.fake-neoversen1.armv6b-novfp
deleted file mode 100644
index d9bd881781..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6b-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5eb armv6b fake_neoversen1"
-TUNE_CCARGS=" -march=armv6"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6hf b/scripts/tune/env.fake-neoversen1.armv6hf
deleted file mode 100644
index 5f6847e1e1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6hf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6hfb b/scripts/tune/env.fake-neoversen1.armv6hfb
deleted file mode 100644
index 2d72803f36..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6hfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6t b/scripts/tune/env.fake-neoversen1.armv6t
deleted file mode 100644
index 078bdd2277..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6t
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6t-novfp b/scripts/tune/env.fake-neoversen1.armv6t-novfp
deleted file mode 100644
index 6d2b2d0cfe..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6t-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6tb b/scripts/tune/env.fake-neoversen1.armv6tb
deleted file mode 100644
index 82986e6bc6..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6tb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6tb-novfp b/scripts/tune/env.fake-neoversen1.armv6tb-novfp
deleted file mode 100644
index 985f0bd0a1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6tb-novfp
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6thf b/scripts/tune/env.fake-neoversen1.armv6thf
deleted file mode 100644
index 3e73ff460c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6thf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv6thfb b/scripts/tune/env.fake-neoversen1.armv6thfb
deleted file mode 100644
index e6f04fa39a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv6thfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a b/scripts/tune/env.fake-neoversen1.armv7a
deleted file mode 100644
index 4337a3101a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp"
-TUNE_PKGARCH="armv7a-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a-neon b/scripts/tune/env.fake-neoversen1.armv7a-neon
deleted file mode 100644
index d821217119..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon"
-TUNE_PKGARCH="armv7a-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7a-neon-vfpv4
deleted file mode 100644
index 4233d7957e..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-neon armv7a-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4"
-TUNE_PKGARCH="armv7a-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7a-vfpv3
deleted file mode 100644
index 835adc48fa..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 armv7a-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7a-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7a-vfpv3d16
deleted file mode 100644
index c60e67381d..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16"
-TUNE_PKGARCH="armv7a-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7a-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7a-vfpv4d16
deleted file mode 100644
index 90035db071..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7a-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7a-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16"
-TUNE_PKGARCH="armv7a-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab b/scripts/tune/env.fake-neoversen1.armv7ab
deleted file mode 100644
index 5d40a44e9a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp bigendian"
-TUNE_PKGARCH="armv7ab-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab-neon b/scripts/tune/env.fake-neoversen1.armv7ab-neon
deleted file mode 100644
index 49455f8a28..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon bigendian"
-TUNE_PKGARCH="armv7ab-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7ab-neon-vfpv4
deleted file mode 100644
index c21d2c5511..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-neon armv7ab-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7ab-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3
deleted file mode 100644
index 1d8e4dc054..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 armv7ab-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3d16
deleted file mode 100644
index 6dc5acbc9b..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7ab-vfpv4d16
deleted file mode 100644
index 2cd5c7b8a7..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ab-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7ab-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7ab-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf b/scripts/tune/env.fake-neoversen1.armv7ahf
deleted file mode 100644
index 53091520e9..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf-neon b/scripts/tune/env.fake-neoversen1.armv7ahf-neon
deleted file mode 100644
index 4a81c7e772..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7ahf-neon-vfpv4
deleted file mode 100644
index 39212ec90a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-neon armv7ahf-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3
deleted file mode 100644
index b0ab417e59..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 armv7ahf-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3d16
deleted file mode 100644
index 594305a76b..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv4d16
deleted file mode 100644
index 2fc4766cb8..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7ahf-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7ahf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb b/scripts/tune/env.fake-neoversen1.armv7ahfb
deleted file mode 100644
index 5ab05f6a18..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb-neon b/scripts/tune/env.fake-neoversen1.armv7ahfb-neon
deleted file mode 100644
index 7caa304fa1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7ahfb-neon-vfpv4
deleted file mode 100644
index 1f97219fa9..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-neon armv7ahfb-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3
deleted file mode 100644
index 5d589c46f3..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 armv7ahfb-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3d16
deleted file mode 100644
index 24550bc52c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv4d16
deleted file mode 100644
index dafb85872a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ahfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7ahfb-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7ahfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at b/scripts/tune/env.fake-neoversen1.armv7at
deleted file mode 100644
index a157ee603b..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb"
-TUNE_PKGARCH="armv7at2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at-neon b/scripts/tune/env.fake-neoversen1.armv7at-neon
deleted file mode 100644
index 81dc901640..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon"
-TUNE_PKGARCH="armv7at2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7at-neon-vfpv4
deleted file mode 100644
index e4dec810c1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-neon armv7at2-neon armv7a-neon-vfpv4 armv7at2-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7at2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7at-vfpv3
deleted file mode 100644
index 1a12f2d1da..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 armv7a-vfpv3 armv7at2-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7at2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7at-vfpv3d16
deleted file mode 100644
index f4fd7708f3..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv3d16 armv7at2-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7at2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7at-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7at-vfpv4d16
deleted file mode 100644
index 95a51deb68..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7at-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7a-vfpv4d16 armv7at2-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7at2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb b/scripts/tune/env.fake-neoversen1.armv7atb
deleted file mode 100644
index ffec6f3557..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb bigendian"
-TUNE_PKGARCH="armv7at2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb-neon b/scripts/tune/env.fake-neoversen1.armv7atb-neon
deleted file mode 100644
index fa026b6e5c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7at2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7atb-neon-vfpv4
deleted file mode 100644
index c99c430771..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-neon armv7at2b-neon armv7ab-neon-vfpv4 armv7at2b-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7at2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3
deleted file mode 100644
index 064bbb6bdd..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 armv7ab-vfpv3 armv7at2b-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3d16
deleted file mode 100644
index dd84e1c041..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv3d16 armv7at2b-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7atb-vfpv4d16
deleted file mode 100644
index 1d23bd0623..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7atb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7ab-vfpv4d16 armv7at2b-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7at2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf b/scripts/tune/env.fake-neoversen1.armv7athf
deleted file mode 100644
index d280fb0ff8..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf-neon b/scripts/tune/env.fake-neoversen1.armv7athf-neon
deleted file mode 100644
index 1a05d3ccfa..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7athf-neon-vfpv4
deleted file mode 100644
index 7b4043b645..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-neon armv7at2hf-neon armv7ahf-neon-vfpv4 armv7at2hf-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3
deleted file mode 100644
index 32d9837804..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 armv7ahf-vfpv3 armv7at2hf-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3d16
deleted file mode 100644
index 5373b59167..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv3d16 armv7at2hf-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7athf-vfpv4d16
deleted file mode 100644
index 37577ba440..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7ahf-vfpv4d16 armv7at2hf-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7at2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb b/scripts/tune/env.fake-neoversen1.armv7athfb
deleted file mode 100644
index e8d7a80e6f..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7a vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb-neon b/scripts/tune/env.fake-neoversen1.armv7athfb-neon
deleted file mode 100644
index fd8fa66916..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7a vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7athfb-neon-vfpv4
deleted file mode 100644
index f870efd635..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-neon armv7at2hfb-neon armv7ahfb-neon-vfpv4 armv7at2hfb-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7a vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3
deleted file mode 100644
index 0ea9756a6d..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 armv7ahfb-vfpv3 armv7at2hfb-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3d16
deleted file mode 100644
index 648d845312..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv3d16 armv7at2hfb-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv4d16
deleted file mode 100644
index 872f87cd87..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7athfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7ahfb-vfpv4d16 armv7at2hfb-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7a vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7at2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve b/scripts/tune/env.fake-neoversen1.armv7ve
deleted file mode 100644
index 16e223564c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp"
-TUNE_PKGARCH="armv7ve-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve-neon b/scripts/tune/env.fake-neoversen1.armv7ve-neon
deleted file mode 100644
index 83f8e56c93..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon"
-TUNE_PKGARCH="armv7ve-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7ve-neon-vfpv4
deleted file mode 100644
index afa6762004..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-neon armv7ve-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4"
-TUNE_PKGARCH="armv7ve-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3
deleted file mode 100644
index 3cddd877e1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 armv7ve-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7ve-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3d16
deleted file mode 100644
index 0f6fa77c54..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16"
-TUNE_PKGARCH="armv7ve-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7ve-vfpv4d16
deleted file mode 100644
index 20a5b701ee..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7ve-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv5 armv5-vfp armv5e armv5e-vfp armv6 armv6-vfp armv7a armv7a-vfp armv7ve armv7ve-vfp armv7ve-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16"
-TUNE_PKGARCH="armv7ve-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb b/scripts/tune/env.fake-neoversen1.armv7veb
deleted file mode 100644
index eb56d4d715..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp bigendian"
-TUNE_PKGARCH="armv7veb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb-neon b/scripts/tune/env.fake-neoversen1.armv7veb-neon
deleted file mode 100644
index 5917b20dde..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon bigendian"
-TUNE_PKGARCH="armv7veb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7veb-neon-vfpv4
deleted file mode 100644
index 3420d562ee..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-neon armv7veb-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7veb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3
deleted file mode 100644
index cc44a1ad67..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 armv7veb-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3d16
deleted file mode 100644
index c714c98b27..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7veb-vfpv4d16
deleted file mode 100644
index f3568565ee..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7veb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv5b armv5b-vfp armv5eb armv5eb-vfp armv6b armv6b-vfp armv7ab-vfp armv7veb-vfp armv7veb-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7veb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf b/scripts/tune/env.fake-neoversen1.armv7vehf
deleted file mode 100644
index bd24953540..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf-neon b/scripts/tune/env.fake-neoversen1.armv7vehf-neon
deleted file mode 100644
index 03be43d740..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vehf-neon-vfpv4
deleted file mode 100644
index 66f30a6b44..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-neon armv7vehf-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3
deleted file mode 100644
index 7e5ac55ecd..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 armv7vehf-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3d16
deleted file mode 100644
index 98c09edf12..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv4d16
deleted file mode 100644
index 2505b09711..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5ehf-vfp armv6hf-vfp armv7ahf-vfp armv7vehf-vfp armv7vehf-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vehf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb b/scripts/tune/env.fake-neoversen1.armv7vehfb
deleted file mode 100644
index 020d16fe57..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb-neon b/scripts/tune/env.fake-neoversen1.armv7vehfb-neon
deleted file mode 100644
index 7577572198..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vehfb-neon-vfpv4
deleted file mode 100644
index d5fe2ab21c..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-neon armv7vehfb-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3
deleted file mode 100644
index ffc0b184f5..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 armv7vehfb-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3d16
deleted file mode 100644
index 40d40f1982..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv4d16
deleted file mode 100644
index 0ba8b29f25..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vehfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5ehfb-vfp armv6hfb-vfp armv7ahfb-vfp armv7vehfb-vfp armv7vehfb-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vehfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet b/scripts/tune/env.fake-neoversen1.armv7vet
deleted file mode 100644
index c84a37a671..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb"
-TUNE_PKGARCH="armv7vet2-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet-neon b/scripts/tune/env.fake-neoversen1.armv7vet-neon
deleted file mode 100644
index 87611a9526..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon"
-TUNE_PKGARCH="armv7vet2-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vet-neon-vfpv4
deleted file mode 100644
index 2a018b2d77..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-neon armv7vet2-neon armv7ve-neon-vfpv4 armv7vet2-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4"
-TUNE_PKGARCH="armv7vet2-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3
deleted file mode 100644
index 8333ffbdab..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 armv7ve-vfpv3 armv7vet2-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3"
-TUNE_PKGARCH="armv7vet2-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3d16
deleted file mode 100644
index 296491b07f..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv3d16 armv7vet2-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16"
-TUNE_PKGARCH="armv7vet2-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vet-vfpv4d16
deleted file mode 100644
index c190a84bb1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vet-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp armv7a armv7a-vfp armv7at2-vfp armv7ve armv7ve-vfp armv7vet2-vfp armv7ve-vfpv4d16 armv7vet2-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16"
-TUNE_PKGARCH="armv7vet2-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb b/scripts/tune/env.fake-neoversen1.armv7vetb
deleted file mode 100644
index 9c001358e2..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb bigendian"
-TUNE_PKGARCH="armv7vet2b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb-neon b/scripts/tune/env.fake-neoversen1.armv7vetb-neon
deleted file mode 100644
index 3649a2c197..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon bigendian"
-TUNE_PKGARCH="armv7vet2b-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vetb-neon-vfpv4
deleted file mode 100644
index d82c3c5cfe..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-neon armv7vet2b-neon armv7veb-neon-vfpv4 armv7vet2b-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 bigendian"
-TUNE_PKGARCH="armv7vet2b-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3
deleted file mode 100644
index 580d67b9fb..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 armv7veb-vfpv3 armv7vet2b-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3d16
deleted file mode 100644
index 863064e0a6..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv3d16 armv7vet2b-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv4d16
deleted file mode 100644
index 949ef4e1d2..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vetb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp armv7ab-vfp armv7at2b-vfp armv7veb-vfp armv7vet2b-vfp armv7veb-vfpv4d16 armv7vet2b-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp"
-TUNE_CCARGS_MFLOAT="softfp"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 bigendian"
-TUNE_PKGARCH="armv7vet2b-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf b/scripts/tune/env.fake-neoversen1.armv7vethf
deleted file mode 100644
index 0bde28ed8a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf-neon b/scripts/tune/env.fake-neoversen1.armv7vethf-neon
deleted file mode 100644
index 3d824e833f..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vethf-neon-vfpv4
deleted file mode 100644
index dcb327ef7d..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-neon-vfpv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3
deleted file mode 100644
index 810dad25f0..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 armv7vehf-vfpv3 armv7vet2hf-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3d16
deleted file mode 100644
index 21ac0e6e54..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv3d16 armv7vet2hf-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv3d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv4d16
deleted file mode 100644
index 13e44d16dc..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethf-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-vfpv4d16 armv7vet2hf-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard"
-TUNE_PKGARCH="armv7vet2hf-vfpv4d16"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb b/scripts/tune/env.fake-neoversen1.armv7vethfb
deleted file mode 100644
index 0c8b57f517..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp"
-TUNE_FEATURES="arm armv7ve vfp thumb callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb-neon b/scripts/tune/env.fake-neoversen1.armv7vethfb-neon
deleted file mode 100644
index 38ecf88dee..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb-neon
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon"
-TUNE_FEATURES="arm armv7ve vfp thumb neon callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb-neon-vfpv4 b/scripts/tune/env.fake-neoversen1.armv7vethfb-neon-vfpv4
deleted file mode 100644
index 4e8cb58d7a..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb-neon-vfpv4
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-neon armv7vet2hfb-neon armv7vehfb-neon-vfpv4 armv7vet2hfb-neon-vfpv4 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp neon vfpv4 neon-vfpv4"
-TUNE_FEATURES="arm armv7ve vfp thumb neon vfpv4 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-neon-vfpv4"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3 b/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3
deleted file mode 100644
index ba67a08f23..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 armv7vehfb-vfpv3 armv7vet2hfb-vfpv3 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16 vfpv3"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 vfpv3 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3d16 b/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3d16
deleted file mode 100644
index a78f944bf4..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv3d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv3d16 armv7vet2hfb-vfpv3d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv3-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv3d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv3d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv3-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv4d16 b/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv4d16
deleted file mode 100644
index c6c90c0eb1..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv7vethfb-vfpv4d16
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp armv7ahfb-vfp armv7at2hfb-vfp armv7vehfb-vfp armv7vet2hfb-vfp armv7vehfb-vfpv4d16 armv7vet2hfb-vfpv4d16 fake_neoversen1"
-TUNE_CCARGS=" -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard"
-TUNE_CCARGS_MFLOAT="hard"
-TUNE_CCARGS_MFPU=" vfp vfpv4-d16"
-TUNE_FEATURES="arm armv7ve vfp thumb vfpv4d16 callconvention-hard bigendian"
-TUNE_PKGARCH="armv7vet2hfb-vfpv4d16"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=vfpv4-d16 -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8-2a b/scripts/tune/env.fake-neoversen1.armv8-2a
deleted file mode 100644
index 6467d8c02d..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8-2a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a fake_neoversen1"
-TUNE_CCARGS=" -march=armv8.2-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8-2a-crypto b/scripts/tune/env.fake-neoversen1.armv8-2a-crypto
deleted file mode 100644
index 675effcabf..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8-2a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto fake_neoversen1"
-TUNE_CCARGS=" -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto"
-TUNE_PKGARCH="armv8-2a"
-export CC="aarch64-oe-linux-gcc -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8a b/scripts/tune/env.fake-neoversen1.armv8a
deleted file mode 100644
index 2b7bf8b81e..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8a
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a fake_neoversen1"
-TUNE_CCARGS=" -march=armv8-a"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8a-crc b/scripts/tune/env.fake-neoversen1.armv8a-crc
deleted file mode 100644
index 90d3292627..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8a-crc
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc fake_neoversen1"
-TUNE_CCARGS=" -march=armv8-a+crc"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8a-crc-crypto b/scripts/tune/env.fake-neoversen1.armv8a-crc-crypto
deleted file mode 100644
index d6a8bef023..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8a-crc-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crc armv8a-crypto armv8a-crc-crypto fake_neoversen1"
-TUNE_CCARGS=" -march=armv8-a+crc+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.armv8a-crypto b/scripts/tune/env.fake-neoversen1.armv8a-crypto
deleted file mode 100644
index 3d853b24a6..0000000000
--- a/scripts/tune/env.fake-neoversen1.armv8a-crypto
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8a-crypto fake_neoversen1"
-TUNE_CCARGS=" -march=armv8-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
-export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-neoversen1.neoversen1 b/scripts/tune/env.fake-neoversen1.neoversen1
deleted file mode 100644
index 91e56e79b7..0000000000
--- a/scripts/tune/env.fake-neoversen1.neoversen1
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_ARCHS="all any noarch aarch64 armv8a armv8-2a armv8-2a-crypto neoversen1 fake_neoversen1"
-TUNE_CCARGS=" -mcpu=neoverse-n1 -march=armv8.2-a+crypto"
-TUNE_CCARGS_MFLOAT=""
-TUNE_CCARGS_MFPU=""
-TUNE_FEATURES="aarch64 armv8-2a crypto neoversen1"
-TUNE_PKGARCH="neoversen1"
-export CC="aarch64-oe-linux-gcc -mcpu=neoverse-n1 -march=armv8.2-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-strongarm1100.armv4t b/scripts/tune/env.fake-strongarm1100.armv4t
index 15009d296f..4d2bf30b1d 100644
--- a/scripts/tune/env.fake-strongarm1100.armv4t
+++ b/scripts/tune/env.fake-strongarm1100.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_strongarm1100"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-strongarm1100.armv4tb b/scripts/tune/env.fake-strongarm1100.armv4tb
index f3d4b8b762..1bfe224ffc 100644
--- a/scripts/tune/env.fake-strongarm1100.armv4tb
+++ b/scripts/tune/env.fake-strongarm1100.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_strongarm1100"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx b/scripts/tune/env.fake-thunderx
index 2777654af0..0c8c18362f 100644
--- a/scripts/tune/env.fake-thunderx
+++ b/scripts/tune/env.fake-thunderx
@@ -4,5 +4,5 @@ TUNE_CCARGS=" -mcpu=thunderx"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 thunderx"
-TUNE_PKGARCH="thunderx"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -mcpu=thunderx --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.armv8a b/scripts/tune/env.fake-thunderx.armv8a
index 7c1874641b..d5a06ec22f 100644
--- a/scripts/tune/env.fake-thunderx.armv8a
+++ b/scripts/tune/env.fake-thunderx.armv8a
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.armv8a-crc b/scripts/tune/env.fake-thunderx.armv8a-crc
index 6534d5b20c..d77b5fab09 100644
--- a/scripts/tune/env.fake-thunderx.armv8a-crc
+++ b/scripts/tune/env.fake-thunderx.armv8a-crc
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.armv8a-crc-crypto b/scripts/tune/env.fake-thunderx.armv8a-crc-crypto
index 7642cc8ed3..15c6a0074e 100644
--- a/scripts/tune/env.fake-thunderx.armv8a-crc-crypto
+++ b/scripts/tune/env.fake-thunderx.armv8a-crc-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crc+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crc crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crc+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.armv8a-crypto b/scripts/tune/env.fake-thunderx.armv8a-crypto
index 43f7a1ebd7..2b7f8d93ef 100644
--- a/scripts/tune/env.fake-thunderx.armv8a-crypto
+++ b/scripts/tune/env.fake-thunderx.armv8a-crypto
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -march=armv8-a+crypto"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 armv8a crypto"
-TUNE_PKGARCH="armv8a"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -march=armv8-a+crypto --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.thunderx b/scripts/tune/env.fake-thunderx.thunderx
index 70ec404f21..f0d9a6199c 100644
--- a/scripts/tune/env.fake-thunderx.thunderx
+++ b/scripts/tune/env.fake-thunderx.thunderx
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -mcpu=thunderx"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 thunderx"
-TUNE_PKGARCH="thunderx"
+TUNE_PKGARCH="aarch64"
export CC="aarch64-oe-linux-gcc -mcpu=thunderx --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-thunderx.thunderx_be b/scripts/tune/env.fake-thunderx.thunderx_be
index a58352b599..617bba71f9 100644
--- a/scripts/tune/env.fake-thunderx.thunderx_be
+++ b/scripts/tune/env.fake-thunderx.thunderx_be
@@ -3,5 +3,5 @@ TUNE_CCARGS=" -mcpu=thunderx"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="aarch64 thunderx bigendian"
-TUNE_PKGARCH="thunderx_be"
+TUNE_PKGARCH="aarch64_be"
export CC="aarch64_be-oe-linux-gcc -mcpu=thunderx --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale b/scripts/tune/env.fake-xscale
index 1f3f71393e..307192e7d5 100644
--- a/scripts/tune/env.fake-xscale
+++ b/scripts/tune/env.fake-xscale
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp xscale xscale-be"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv4t b/scripts/tune/env.fake-xscale.armv4t
index ab53ae3a35..53fca2f9a9 100644
--- a/scripts/tune/env.fake-xscale.armv4t
+++ b/scripts/tune/env.fake-xscale.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_xscale"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv4tb b/scripts/tune/env.fake-xscale.armv4tb
index 691a4544c1..8b51a92612 100644
--- a/scripts/tune/env.fake-xscale.armv4tb
+++ b/scripts/tune/env.fake-xscale.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_xscale"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5t b/scripts/tune/env.fake-xscale.armv5t
index d1fb548134..aa06fc74bb 100644
--- a/scripts/tune/env.fake-xscale.armv5t
+++ b/scripts/tune/env.fake-xscale.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5t"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5t-vfp b/scripts/tune/env.fake-xscale.armv5t-vfp
index 1fef2df36e..f26ddc912e 100644
--- a/scripts/tune/env.fake-xscale.armv5t-vfp
+++ b/scripts/tune/env.fake-xscale.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5t-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tb b/scripts/tune/env.fake-xscale.armv5tb
index 0a2bf4d7f2..00d7babe7b 100644
--- a/scripts/tune/env.fake-xscale.armv5tb
+++ b/scripts/tune/env.fake-xscale.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb"
+TUNE_CCARGS=" -march=armv5t -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5tb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tb-vfp b/scripts/tune/env.fake-xscale.armv5tb-vfp
index 2775ce1033..166113cf66 100644
--- a/scripts/tune/env.fake-xscale.armv5tb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5tb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5b-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5te b/scripts/tune/env.fake-xscale.armv5te
index 25a6029381..2f81614a21 100644
--- a/scripts/tune/env.fake-xscale.armv5te
+++ b/scripts/tune/env.fake-xscale.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5te"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5te-vfp b/scripts/tune/env.fake-xscale.armv5te-vfp
index efb215d49d..6facf306a2 100644
--- a/scripts/tune/env.fake-xscale.armv5te-vfp
+++ b/scripts/tune/env.fake-xscale.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5te-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5e-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5teb b/scripts/tune/env.fake-xscale.armv5teb
index 6b806de1d9..765ac50dba 100644
--- a/scripts/tune/env.fake-xscale.armv5teb
+++ b/scripts/tune/env.fake-xscale.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb"
+TUNE_CCARGS=" -march=armv5te -marm"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5teb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5teb-vfp b/scripts/tune/env.fake-xscale.armv5teb-vfp
index 594cc6cf79..2ca299e4bb 100644
--- a/scripts/tune/env.fake-xscale.armv5teb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5teb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5eb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tehf-vfp b/scripts/tune/env.fake-xscale.armv5tehf-vfp
index 7f2eb160bc..0e7a094765 100644
--- a/scripts/tune/env.fake-xscale.armv5tehf-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5tehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tehfb-vfp b/scripts/tune/env.fake-xscale.armv5tehfb-vfp
index 84155075b1..21c8066542 100644
--- a/scripts/tune/env.fake-xscale.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5tehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5ehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5thf-vfp b/scripts/tune/env.fake-xscale.armv5thf-vfp
index 9ff3c58eb9..22397067f7 100644
--- a/scripts/tune/env.fake-xscale.armv5thf-vfp
+++ b/scripts/tune/env.fake-xscale.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5thf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5thfb-vfp b/scripts/tune/env.fake-xscale.armv5thfb-vfp
index 1a5afe615a..4c244d7e05 100644
--- a/scripts/tune/env.fake-xscale.armv5thfb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5thfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5hfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.xscale b/scripts/tune/env.fake-xscale.xscale
index 9a0d4998a5..8b226120a8 100644
--- a/scripts/tune/env.fake-xscale.xscale
+++ b/scripts/tune/env.fake-xscale.xscale
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te xscale xscalet xscalee xscalete fake_xscale"
-TUNE_CCARGS=" -mthumb -mcpu=xscale"
+TUNE_CCARGS=" -marm -mcpu=xscale"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp xscale"
-TUNE_PKGARCH="xscalete"
-export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=xscale --sysroot=SYSROOT"
+TUNE_PKGARCH="xscalee"
+export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=xscale --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.xscale-be b/scripts/tune/env.fake-xscale.xscale-be
index 46ad685563..6f0021e6e6 100644
--- a/scripts/tune/env.fake-xscale.xscale-be
+++ b/scripts/tune/env.fake-xscale.xscale-be
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb xscaleb xscaletb xscaleeb xscaleteb fake_xscale"
-TUNE_CCARGS=" -mthumb -mcpu=xscale"
+TUNE_CCARGS=" -marm -mcpu=xscale"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp xscale bigendian"
-TUNE_PKGARCH="xscaleteb"
-export CC="armeb-oe-linux-gnueabi-gcc -mthumb -mcpu=xscale --sysroot=SYSROOT"
+TUNE_PKGARCH="xscaleeb"
+export CC="armeb-oe-linux-gnueabi-gcc -marm -mcpu=xscale --sysroot=SYSROOT"
diff --git a/scripts/tune/log.fake-arm9tdmi.arm9tdmi b/scripts/tune/log.fake-arm9tdmi.arm9tdmi
new file mode 100644
index 0000000000..afe57db49e
--- /dev/null
+++ b/scripts/tune/log.fake-arm9tdmi.arm9tdmi
@@ -0,0 +1,8 @@
+NOTE: Reconnecting to bitbake server...
+ERROR: OE-core's config sanity checker detected a potential misconfiguration.
+ Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
+ Following is the list of potential problems / advisories:
+
+ Error, the PACKAGE_ARCHS variable (all any noarch arm armv4 armv4t arm9tdmit fake_arm9tdmi) for DEFAULTTUNE (arm9tdmi) does not contain TUNE_PKGARCH (arm9tdmi).
+
+Summary: There was 1 ERROR message shown, returning a non-zero exit code.
diff --git a/scripts/tune/log.fake-supersparc b/scripts/tune/log.fake-supersparc
new file mode 100644
index 0000000000..92859d8cd5
--- /dev/null
+++ b/scripts/tune/log.fake-supersparc
@@ -0,0 +1,10 @@
+NOTE: Reconnecting to bitbake server...
+ERROR: OE-core's config sanity checker detected a potential misconfiguration.
+ Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
+ Following is the list of potential problems / advisories:
+
+ Error, the PACKAGE_ARCHS variable (all any noarch ${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}} fake_supersparc) for DEFAULTTUNE (None) does not contain TUNE_PKGARCH (supersparc).Toolchain tunings invalid:
+No tuning found for default multilib.
+
+
+Summary: There was 1 ERROR message shown, returning a non-zero exit code.