cmake: emu: armfvp: Only add the -a argument if not already present

ithinuel · kartben · commit fa45bebccfb1 · 2025-03-31T11:30:55.000+02:00
Some target may need to pass in the application argument. In such case
do not override it.

Signed-off-by: Wilfried Chauveau &lt;wilfried.chauveau@arm.com&gt;
Signed-off-by: Sudan Landge &lt;sudan.landge@arm.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,12 @@ elseif(CONFIG_ARMV8_A_NS)`
`53`	`53`	`--data cluster0.cpu0="${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}"@0x88000000`
`54`	`54`	`)`
`55`	`55`	`else()`
`56`		`- set(ARMFVP_FLAGS ${ARMFVP_FLAGS}`
`57`		`- -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}`
	`56`	`+ string(FIND "${ARMFVP_FLAGS}" " -a " ARMFVP_APPARG_POS)`
	`57`	`+ if(${ARMFVP_APPARG_POS} EQUAL -1)`
	`58`	`+ set(ARMFVP_FLAGS ${ARMFVP_FLAGS}`
	`59`	`+ -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}`
`58`	`60`	`)`
	`61`	`+ endif()`
`59`	`62`	`endif()`
`60`	`63`
`61`	`64`	`if(CONFIG_ETH_SMSC91X)`