Support building testing target for Corstone-320

Signed-off-by: Per Åstrand <[email protected]>
Change-Id: I98ec1f0e27a801fc4686cf3f63807ba81b8e88ce

Author: per

backends/arm/test/runner_utils.py

@@ -226,7 +226,9 @@ def run_corstone300(
                 os.path.join(self.intermediate_path, f"{name}.bin"),
             )
         elf_path = os.path.join(
-            "cmake-out", "arm_semihosting_executor_runner", "arm_executor_runner"
+            "cmake-out",
+            "arm_semihosting_executor_runner_corstone-300",
+            "arm_executor_runner",
         )
         assert os.path.exists(
             elf_path

backends/arm/test/setup_testing.sh

@@ -13,17 +13,30 @@ ethos_u_root_dir=${et_root_dir}/examples/arm/ethos-u-scratch/ethos-u
 
 toolchain_cmake=${et_root_dir}/examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
 et_build_dir=${et_root_dir}/cmake-out
-build_test_dir=${et_build_dir}/arm_semihosting_executor_runner
+build_root_test_dir=${et_build_dir}/arm_semihosting_executor_runner
 fvp_model=FVP_Corstone_SSE-300_Ethos-U55
 
 # Build Arm Baremetal executor_runner in semihosting mode.
 # Put in backends/arm/test/res to be used by unit tests.
 function build_semihosting_executorch_runner() {
+    target_board=$1
+    build_test_dir=${build_root_test_dir}_${target_board}
+    echo "[${FUNCNAME[0]}] Configuring ${target_board}"
+    if [[ ${target_board} == "corstone-300" ]]; then
+        local target_cpu=cortex-m55
+    elif [[ ${target_board} == "corstone-320" ]]; then
+        local target_cpu=cortex-m85
+    else
+        echo "[${FUNCNAME[0]}] ERROR: Invalid target_board specified!"
+        exit 1
+    fi
     cd ${et_root_dir}/examples/arm/executor_runner
     pwd
     mkdir -p ${build_test_dir}
     cmake -DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake}          \
-          -DTARGET_CPU=cortex-m55                            \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo                  \
+          -DTARGET_CPU=${target_cpu}                         \
+          -DTARGET_BOARD=${target_board}                     \
           -DSEMIHOSTING=ON                                   \
           -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${build_test_dir} \
           -B ${build_test_dir}                               \
@@ -40,4 +53,6 @@ function build_semihosting_executorch_runner() {
     find ${build_test_dir} -name "arm_executor_runner"
 }
 
-build_semihosting_executorch_runner
+build_semihosting_executorch_runner corstone-300
+
+build_semihosting_executorch_runner corstone-320