1 files changed, 4 insertions, 10 deletions

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 \
         "