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, 20 insertions, 8 deletions

diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index e12028b4..d2a174d5 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -16,16 +16,22 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and armrm overrides are set w/ cortex r5
-# So only set rmprofile if armrm is defined.
+# Both arm and armv7r/armv8r overrides are set w/ cortex r5
+# So only set rmprofile if armv*r is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE:armrm = "rmprofile"
+ARM_PROFILE:armv7r = "rmprofile"
+ARM_PROFILE:armv8r = "rmprofile"
 
 EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \
         --with-multilib-list=${ARM_PROFILE} \
         "
 
-EXTRA_OECONF:append:xilinx-standalone:armrm:class-target = " \
+EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \
+        --disable-tls \
+        --disable-decimal-float \
+        "
+
+EXTRA_OECONF:append:xilinx-standalone:armv8r: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 1262bd3c..ec76d518 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -12,15 +12,21 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and armrm overrides are set w/ cortex r5
-# So only set rmprofile if armrm is defined.
+# Both arm and armv*r overrides are set w/ cortex r5
+# So only set rmprofile if armv*r is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE:armrm = "rmprofile"
+ARM_PROFILE:armv7r = "rmprofile"
+ARM_PROFILE:armv8r = "rmprofile"
 EXTRA_OECONF:append:xilinx-standalone:arm = " \
         --with-multilib-list=${ARM_PROFILE} \
         "
 
-EXTRA_OECONF:append:xilinx-standalone:armrm = " \
+EXTRA_OECONF:append:xilinx-standalone:armv7r = " \
+        --disable-tls \
+        --disable-decimal-float \
+        "
+
+EXTRA_OECONF:append:xilinx-standalone:armv8r = " \
         --disable-tls \
         --disable-decimal-float \
         "