diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-18 10:20:35 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-14 11:23:13 -0800 |
commit | 3d23cd2ec09f9950fc36ebf6797cd82968d61568 (patch) | |
tree | 9222bf0cd6d92dd43b58283e3d6ab4a171666e8b /meta-xilinx-bsp/conf | |
parent | 84305bdaf64651f5c5f2fd46a807da7d30f9f52c (diff) | |
download | meta-xilinx-3d23cd2ec09f9950fc36ebf6797cd82968d61568.tar.gz |
Remove cortexrm tune, as Yocto Project now has cortex-r tunes
armrm override is now replaced by armv7r and armv8r overrides. Adjust
recipes to match the new usage.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc | 3 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc | 21 |
2 files changed, 1 insertions, 23 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc b/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc index 66ab6158..810ad9e9 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc | |||
@@ -1,7 +1,6 @@ | |||
1 | # Unfortunately various tunefiles don't include each other, so create | 1 | # Unfortunately various tunefiles don't include each other, so create |
2 | # a list of things to require based on the DEFAULTTUNE setting. | 2 | # a list of things to require based on the DEFAULTTUNE setting. |
3 | TUNEFILE[cortexr5] = "conf/machine/include/tune-cortexrm.inc" | 3 | TUNEFILE[cortexr5] = "conf/machine/include/arm/armv7r/tune-cortexr5.inc" |
4 | TUNEFILE[cortexr5f] = "conf/machine/include/tune-cortexrm.inc" | ||
5 | TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc" | 4 | TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc" |
6 | TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc" | 5 | TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc" |
7 | TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc" | 6 | TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc" |
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc deleted file mode 100644 index e415209b..00000000 --- a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | DEFAULTTUNE ?= "cortexr5" | ||
2 | |||
3 | require conf/machine/include/arm/arch-armv8a.inc | ||
4 | |||
5 | TUNEVALID[armrm] = "Enable ARM Cortex-R/M Family" | ||
6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armrm', 'armrm:', '' ,d)}" | ||
7 | |||
8 | TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" | ||
9 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" | ||
10 | |||
11 | AVAILTUNES += "cortexr5" | ||
12 | ARMPKGARCH:tune-cortexr5 = "cortexr5" | ||
13 | |||
14 | TUNE_FEATURES:tune-cortexr5 = "armrm cortexr5" | ||
15 | PACKAGE_EXTRA_ARCHS:tune-cortexr5 = "${TUNE_PKGARCH}" | ||
16 | |||
17 | AVAILTUNES += "cortexr5f" | ||
18 | ARMPKGARCH:tune-cortexr5f = "cortexr5f" | ||
19 | |||
20 | TUNE_FEATURES:tune-cortexr5f = "armrm cortexr5 vfpv3d16 callconvention-hard" | ||
21 | PACKAGE_EXTRA_ARCHS:tune-cortexr5f = "${TUNE_PKGARCH}" | ||