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>

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 @@
 # Unfortunately various tunefiles don't include each other, so create
 # a list of things to require based on the DEFAULTTUNE setting.
-TUNEFILE[cortexr5] = "conf/machine/include/tune-cortexrm.inc"
-TUNEFILE[cortexr5f] = "conf/machine/include/tune-cortexrm.inc"
+TUNEFILE[cortexr5] = "conf/machine/include/arm/armv7r/tune-cortexr5.inc"
 TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc"
 TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc"
 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 @@
-DEFAULTTUNE ?= "cortexr5"
-
-require conf/machine/include/arm/arch-armv8a.inc
-
-TUNEVALID[armrm] = "Enable ARM Cortex-R/M Family"
-MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armrm', 'armrm:', '' ,d)}"
-
-TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}"
-
-AVAILTUNES += "cortexr5"
-ARMPKGARCH:tune-cortexr5 = "cortexr5"
-
-TUNE_FEATURES:tune-cortexr5 = "armrm cortexr5"
-PACKAGE_EXTRA_ARCHS:tune-cortexr5 = "${TUNE_PKGARCH}"
-
-AVAILTUNES += "cortexr5f"
-ARMPKGARCH:tune-cortexr5f = "cortexr5f"
-
-TUNE_FEATURES:tune-cortexr5f = "armrm cortexr5 vfpv3d16 callconvention-hard"
-PACKAGE_EXTRA_ARCHS:tune-cortexr5f = "${TUNE_PKGARCH}"