From 491f4599e1d570ee67b4b932a9e18317b2aa49a5 Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Fri, 22 Mar 2024 10:06:37 +0200 Subject: [PATCH] Enable new ssrc boards in CI Signed-off-by: Jukka Laitinen --- .github/workflows/tiiuae-pixhawk-and-saluki.yaml | 2 +- boards/ssrc/saluki-nxp93 | 2 +- build.sh | 6 ++++++ packaging/Dockerfile.build_env_pre | 6 +++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml index 00b0f1c81d08..40fc1f7f3e10 100644 --- a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml +++ b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - product: [pixhawk, fmu-v6xrt, saluki-v2_default, saluki-v2_amp, saluki-v2_flat, saluki-pi_default, saluki-pi_amp, saluki-pi_flat, saluki-v3_default, saluki-v3_amp, saluki-v3_flat] + product: [pixhawk, fmu-v6xrt, saluki-v2_default, saluki-v2_amp, saluki-v2_flat, saluki-pi_default, saluki-pi_amp, saluki-pi_flat, saluki-v3_default, saluki-v3_amp, saluki-v3_flat, saluki-nxp93_flat] include: - product: saluki-v2_custom_keys keys: Tools/saluki-sec-scripts/custom_keys/saluki-v2/px4_bin_ed25519_private.pem diff --git a/boards/ssrc/saluki-nxp93 b/boards/ssrc/saluki-nxp93 index 1f83ebfb6f9a..177c13051ef3 160000 --- a/boards/ssrc/saluki-nxp93 +++ b/boards/ssrc/saluki-nxp93 @@ -1 +1 @@ -Subproject commit 1f83ebfb6f9a7864a290873b0e5eac6901bfa8b0 +Subproject commit 177c13051ef38ea7b44f5ac78daf5ae34eac8b82 diff --git a/build.sh b/build.sh index 2c7a922ba7cd..96fdc457bb4d 100755 --- a/build.sh +++ b/build.sh @@ -19,6 +19,7 @@ usage() { echo " saluki-v3_default" echo " saluki-v3_amp" echo " saluki-v3_flat" + echo " saluki-nxp93_flat" echo exit 1 } @@ -133,6 +134,11 @@ case $target in cp ${script_dir}/build/ssrc_saluki-pi_default/ssrc_saluki-pi_default.px4 ${dest_dir}/ssrc_saluki-pi_custom_keys-${version}.px4 cp ${script_dir}/build/ssrc_saluki-pi_default/ssrc_saluki-pi_default_kernel.elf ${dest_dir}/ssrc_saluki-pi_custom_keys_kernel-${version}.elf ;; + "saluki-nxp93_flat") + $build_cmd_fw ssrc_saluki-nxp93_flat + cp ${script_dir}/build/ssrc_saluki-nxp93_flat/ssrc_saluki-nxp93_flat.px4 ${dest_dir}/ssrc_saluki-nxp93_flat-${version}.px4 + cp ${script_dir}/build/ssrc_saluki-nxp93_flat/ssrc_saluki-nxp93_flat.elf ${dest_dir}/ssrc_saluki-nxp93_flat-${version}.elf + ;; *) usage diff --git a/packaging/Dockerfile.build_env_pre b/packaging/Dockerfile.build_env_pre index 9e0d12903e95..dd0e2e08835a 100644 --- a/packaging/Dockerfile.build_env_pre +++ b/packaging/Dockerfile.build_env_pre @@ -33,4 +33,8 @@ RUN curl -LOs https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/ tar xvf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -C /tools && \ rm -f gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -ENV PATH=/tools/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin:/tools/gcc-arm-none-eabi-9-2019-q4-major/bin/:$PATH +RUN curl -LOs https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-elf.tar.xz && \ + tar xvf arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-elf.tar.xz -C /tools && \ + rm -f arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-elf.tar.xz + +ENV PATH=/tools/arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-elf/bin:/tools/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin:/tools/gcc-arm-none-eabi-9-2019-q4-major/bin/:$PATH