From fa45bebccfb1fa4ce25627518b0000cd80057555 Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@arm.com>
Date: Mon, 3 Jun 2024 23:24:31 +0100
Subject: [PATCH] cmake: emu: armfvp: Only add the -a argument if not already
 present

Some target may need to pass in the application argument. In such case
do not override it.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
Signed-off-by: Sudan Landge <sudan.landge@arm.com>
---
 cmake/emu/armfvp.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/emu/armfvp.cmake b/cmake/emu/armfvp.cmake
index 70fa5dc0aa3..354cc43cbcf 100644
--- a/cmake/emu/armfvp.cmake
+++ b/cmake/emu/armfvp.cmake
@@ -53,9 +53,12 @@ elseif(CONFIG_ARMV8_A_NS)
     --data cluster0.cpu0="${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}"@0x88000000
     )
 else()
-  set(ARMFVP_FLAGS ${ARMFVP_FLAGS}
-    -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
+  string(FIND "${ARMFVP_FLAGS}" " -a " ARMFVP_APPARG_POS)
+  if(${ARMFVP_APPARG_POS} EQUAL -1)
+    set(ARMFVP_FLAGS ${ARMFVP_FLAGS}
+      -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
     )
+  endif()
 endif()
 
 if(CONFIG_ETH_SMSC91X)