standalone: Add support for r5/r52 hf tunes

c45298aaf4fe commit (machine/include/arm: Backport tune files from master) in
meta-xilinx layer added the support for cortex-r5 and cortexr-r52 hard float ABI
tunes. Update the conditions that generate the CMAKE_SYSTEM_PROCESSOR to
incorporate these two new tunes.

Moreover, some additional cflags (-DARMR5 -DARMR52) are needed to compile Cortex
R52 specific boot code in embeddedsw. Update the same.

Signed-off-by: Onkar Harsh <onkar.harsh@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index f9373b7a..f13df66b 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -53,9 +53,9 @@ def get_xlnx_cmake_processor(tune, machine, variant, d):
             cmake_processor = 'plm_microblaze'
         else:
             cmake_processor = 'microblaze'
-    elif tune == 'cortexr5':
+    elif (tune in [ 'cortexr5', 'cortexr5hf' ]):
         cmake_processor = 'cortexr5'
-    elif tune == 'cortexr52':
+    elif (tune in [ 'cortexr52', 'cortexr52hf' ]):
         cmake_processor = 'cortexr52'
     elif tune.startswith('cortexa9'):
         cmake_processor = 'cortexa9'
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 62c5a211..e38342b5 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -15,6 +15,7 @@ ESW_CFLAGS ?= ""
 
 # Cortex R5 requires an additional cflag to be passed for compatibility with the embeddedsw
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', '', d)}"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr52', ' -DARMR5 -DARMR52', '', d)}"
 TUNE_CCARGS:append:versal = " -Dversal"
 TUNE_CCARGS:append:versal-net = " -DVERSAL_NET"