commit 95550fd18168a5bfce48a9bfa81dd50007df5caa
author Per Åstrand <per.astrand@arm.com> Wed Feb 24 10:39:15 2021 +0100
committer Kristofer Jonsson <kristofer.jonsson@arm.com> Wed Feb 24 13:35:56 2021 +0000
tree 2d72dc5c72088768cfbbac8799426dcfc85bb4e6
parent 866284086b546518bfe7f175cdb7239b935a66ea

Support released versions of FVPs

Change-Id: Ia2ca0593e65bdb570c53a16cf7706d876e649e18

targets/corstone-300/CMakeLists.txt

diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt
index c734044..2efd329 100644
--- a/targets/corstone-300/CMakeLists.txt
+++ b/targets/corstone-300/CMakeLists.txt
@@ -26,8 +26,27 @@
     set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/toolchain/armclang.cmake")
 endif()
 
+execute_process(
+    COMMAND FVP_Corstone_SSE-300_Ethos-U55 --version
+    OUTPUT_VARIABLE FVP_VERSION_OUTPUT
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND_ERROR_IS_FATAL ANY)
+
+if (${FVP_VERSION_OUTPUT} MATCHES "Fast Models \\[([0-9]+\\.[0-9]+\\.[0-9]+)")
+    set(FVP_VERSION ${CMAKE_MATCH_1})
+else()
+    message("Unknown version")
+endif()
+
+if (${FVP_VERSION} STREQUAL "11.13.41")
+    set(FVP_EXTRA_ARGS "ethosu.num_macs=128")
+elseif (${FVP_VERSION} STREQUAL "11.12.57")
+    set(FVP_EXTRA_ARGS "ethosu.config=H128")
+endif ()
+
 set(ETHOSU_COMMAND_DEFAULT
     FVP_Corstone_SSE-300_Ethos-U55
+        -C ${FVP_EXTRA_ARGS}
         -C mps3_board.visualisation.disable-visualisation=1
         -C mps3_board.telnetterminal0.start_telnet=0
         -C mps3_board.uart0.out_file="-"