Fix arm cortex r/m profiles

As part of the merge of the code bases, changes were introduced that
changed the way the cortexr5 was defined.  To sync this between the
baremetal compilation and the baremetal toolchain compilation we
create a new armrm tune file, define a new tune feature of 'armrm',
define 'armrm' as a new machine override based on the feature 'armrm',
and move the cortexr5 tuning to a common file.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 8 insertions, 20 deletions

diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index 75fa6419..0d25e066 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -16,22 +16,16 @@ EXTRA_OECONF_append_xilinx-standalone_aarch64_class-target = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and cortexr5 overrides are set w/ r5
-# So only set rmprofile if r5 is defined.
+# Both arm and armrm overrides are set w/ cortex r5
+# So only set rmprofile if armrm is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE_cortexr5-zynqmp = "rmprofile"
-ARM_PROFILE_cortexr5-versal = "rmprofile"
+ARM_PROFILE_armrm = "rmprofile"
 
 EXTRA_OECONF_append_xilinx-standalone_arm_class-target = " \
         --with-multilib-list=${ARM_PROFILE} \
         "
 
-EXTRA_OECONF_append_xilinx-standalone_cortexr5-versal_class-target = " \
-        --disable-tls \
-        --disable-decimal-float \
-        "
-
-EXTRA_OECONF_append_xilinx-standalone_cortexr5-versal_class-target = " \
+EXTRA_OECONF_append_xilinx-standalone_armrm_class-target = " \
         --disable-tls \
         --disable-decimal-float \
         "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
index 21d30361..34b5083e 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -16,21 +16,15 @@ EXTRA_OECONF_append_xilinx-standalone_aarch64 = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and cortexr5 overrides are set w/ r5
-# So only set rmprofile if r5 is defined.
+# Both arm and armrm overrides are set w/ cortex r5
+# So only set rmprofile if armrm is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE_cortexr5-zynqmp = "rmprofile"
-ARM_PROFILE_cortexr5-versal = "rmprofile"
+ARM_PROFILE_armrm = "rmprofile"
 EXTRA_OECONF_append_xilinx-standalone_arm = " \
         --with-multilib-list=${ARM_PROFILE} \
         "
 
-EXTRA_OECONF_append_xilinx-standalone_cortexr5-zynqmp = " \
-        --disable-tls \
-        --disable-decimal-float \
-        "
-
-EXTRA_OECONF_append_xilinx-standalone_cortexr5-versal = " \
+EXTRA_OECONF_append_xilinx-standalone_armrm = " \
         --disable-tls \
         --disable-decimal-float \
         "