tiiuae CI: Update build scripts to build _default, _amp and _flat tar…

…gets Signed-off-by: Jukka Laitinen <[email protected]>
tiiuae · Feb 21, 2024 · ebcbca1 · ebcbca1
1 parent e1af4db
commit ebcbca1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 33 deletions.
diff --git 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_kernel, saluki-pi_default, saluki-pi_amp, saluki-v3_default, saluki-v3_amp]
+        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]
         include:
           - product: saluki-v2_custom_keys
             keys: Tools/saluki-sec-scripts/custom_keys/saluki-v2/px4_bin_ed25519_private.pem

diff --git a/build.sh b/build.sh
@@ -3,24 +3,22 @@
 usage() {
   set +x
   echo ""
-	echo " usage: $0 <output-dir> <build-target>"
-	echo "   output-dir : directory for output artifacts"
-	echo "   build-target : supported build targets:"
+  echo " usage: $0 <output-dir> <build-target>"
+  echo "   output-dir : directory for output artifacts"
+  echo "   build-target : supported build targets:"
   echo "     px4fwupdater"
   echo "     pixhawk"
   echo "     fmu-v6xrt"
   echo "     saluki-v1_default"
-  echo "     saluki-v1_protected"
-  echo "     saluki-v1_amp"
   echo "     saluki-v2_default"
   echo "     saluki-v2_amp"
-  echo "     saluki-v2_protected"
-  echo "     saluki-v2_kernel"
+  echo "     saluki-v2_flat"
   echo "     saluki-pi_default"
   echo "     saluki-pi_amp"
-  echo "     saluki-pi_protected"
+  echo "     saluki-pi_flat"
   echo "     saluki-v3_default"
   echo "     saluki-v3_amp"
+  echo "     saluki-v3_flat"
   echo
   exit 1
 }
@@ -72,67 +70,65 @@ case $target in
     $build_cmd_fw ssrc_saluki-v1_default
     cp ${script_dir}/build/ssrc_saluki-v1_default/ssrc_saluki-v1_default.px4 ${dest_dir}/ssrc_saluki-v1_default-${version}.px4
     ;;
-  "saluki-v1_protected")
-    $build_cmd_fw ssrc_saluki-v1_protected
-    cp ${script_dir}/build/ssrc_saluki-v1_protected/ssrc_saluki-v1_protected.px4 ${dest_dir}/ssrc_saluki-v1_protected-${version}.px4
-    ;;
-  "saluki-v1_amp")
-    $build_cmd_fw ssrc_saluki-v1_amp
-    cp ${script_dir}/build/ssrc_saluki-v1_amp/ssrc_saluki-v1_amp.bin ${dest_dir}/ssrc_saluki-v1_amp-${version}.bin
-    ;;
   "saluki-v2_default")
     $build_cmd_fw ssrc_saluki-v2_default
     cp ${script_dir}/build/ssrc_saluki-v2_default/ssrc_saluki-v2_default.px4 ${dest_dir}/ssrc_saluki-v2_default-${version}.px4
-    ;;
-  "saluki-v2_protected")
-    $build_cmd_fw ssrc_saluki-v2_protected
-    cp ${script_dir}/build/ssrc_saluki-v2_protected/ssrc_saluki-v2_protected.px4 ${dest_dir}/ssrc_saluki-v2_protected-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-v2_default/ssrc_saluki-v2_default_kernel.elf ${dest_dir}/ssrc_saluki-v2_default_kernel-${version}.elf
     ;;
   "saluki-v2_amp")
     $build_cmd_fw ssrc_saluki-v2_amp
     cp ${script_dir}/build/ssrc_saluki-v2_amp/ssrc_saluki-v2_amp.bin ${dest_dir}/ssrc_saluki-v2_amp-${version}.bin
+    cp ${script_dir}/build/ssrc_saluki-v2_amp/ssrc_saluki-v2_amp_kernel.elf ${dest_dir}/ssrc_saluki-v2_amp_kernel-${version}.elf
     ;;
-  "saluki-v2_kernel")
-    $build_cmd_fw ssrc_saluki-v2_kernel
-    cp ${script_dir}/build/ssrc_saluki-v2_kernel/ssrc_saluki-v2_kernel.px4 ${dest_dir}/ssrc_saluki-v2_kernel-${version}.px4
-    cp ${script_dir}/build/ssrc_saluki-v2_kernel/ssrc_saluki-v2_kernel.bin ${dest_dir}/ssrc_saluki-v2_kernel-${version}.bin
-    cp ${script_dir}/build/ssrc_saluki-v2_kernel/ssrc_saluki-v2_kernel_kernel.elf ${dest_dir}/ssrc_saluki-v2_kernel-${version}.elf
+  "saluki-v2_flat")
+    $build_cmd_fw ssrc_saluki-v2_flat
+    cp ${script_dir}/build/ssrc_saluki-v2_flat/ssrc_saluki-v2_flat.px4 ${dest_dir}/ssrc_saluki-v2_flat-${version}.px4
     ;;
   "saluki-v2_custom_keys")
     # on custom keys case we build _default target but SIGNING_ARGS env variable is set above in build_cmd_fw
     $build_cmd_fw ssrc_saluki-v2_default
     cp ${script_dir}/build/ssrc_saluki-v2_default/ssrc_saluki-v2_default.px4 ${dest_dir}/ssrc_saluki-v2_custom_keys-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-v2_default/ssrc_saluki-v2_default_kernel.elf ${dest_dir}/ssrc_saluki-v2_default_kernel-${version}.elf
     ;;
-
   "saluki-v3_default")
     $build_cmd_fw ssrc_saluki-v3_default
     cp ${script_dir}/build/ssrc_saluki-v3_default/ssrc_saluki-v3_default.px4 ${dest_dir}/ssrc_saluki-v3_default-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-v3_default/ssrc_saluki-v3_default_kernel.elf ${dest_dir}/ssrc_saluki-v3_default_kernel-${version}.elf
     ;;
   "saluki-v3_amp")
     $build_cmd_fw ssrc_saluki-v3_amp
-    cp ${script_dir}/build/ssrc_saluki-v3_amp/ssrc_saluki-v3_amp.bin ${dest_dir}/ssrc_saluki-v3_amp-${version}.bin
+    cp ${script_dir}/build/ssrc_saluki-v3_amp/ssrc_saluki-v3_amp.px4 ${dest_dir}/ssrc_saluki-v3_amp-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-v3_amp/ssrc_saluki-v3_amp_kernel.elf ${dest_dir}/ssrc_saluki-v3_amp_kernel-${version}.elf
+    ;;
+  "saluki-v3_flat")
+    $build_cmd_fw ssrc_saluki-v3_flat
+    cp ${script_dir}/build/ssrc_saluki-v3_flat/ssrc_saluki-v3_flat.px4 ${dest_dir}/ssrc_saluki-v3_flat-${version}.px4
     ;;
   "saluki-v3_custom_keys")
     # on custom keys case we build _default target but SIGNING_ARGS env variable is set above in build_cmd_fw
     $build_cmd_fw ssrc_saluki-v3_default
     cp ${script_dir}/build/ssrc_saluki-v3_default/ssrc_saluki-v3_default.px4 ${dest_dir}/ssrc_saluki-v3_custom_keys-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-v3_default/ssrc_saluki-v3_default_kernel.elf ${dest_dir}/ssrc_saluki-v3_default_kernel-${version}.elf
     ;;
   "saluki-pi_default")
     $build_cmd_fw ssrc_saluki-pi_default
     cp ${script_dir}/build/ssrc_saluki-pi_default/ssrc_saluki-pi_default.px4 ${dest_dir}/ssrc_saluki-pi_default-${version}.px4
-    ;;
-  "saluki-pi_protected")
-    $build_cmd_fw ssrc_saluki-pi_protected
-    cp ${script_dir}/build/ssrc_saluki-pi_protected/ssrc_saluki-pi_protected.px4 ${dest_dir}/ssrc_saluki-pi_protected-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-pi_default/ssrc_saluki-pi_default_kernel.elf ${dest_dir}/ssrc_saluki-pi_default_kernel-${version}.elf
     ;;
   "saluki-pi_amp")
     $build_cmd_fw ssrc_saluki-pi_amp
-    cp ${script_dir}/build/ssrc_saluki-pi_amp/ssrc_saluki-pi_amp.bin ${dest_dir}/ssrc_saluki-pi_amp-${version}.bin
+    cp ${script_dir}/build/ssrc_saluki-pi_amp/ssrc_saluki-pi_amp.px4 ${dest_dir}/ssrc_saluki-pi_amp-${version}.px4
+    cp ${script_dir}/build/ssrc_saluki-pi_amp/ssrc_saluki-pi_amp_kernel.elf ${dest_dir}/ssrc_saluki-pi_amp_kernel-${version}.elf
+    ;;
+  "saluki-pi_flat")
+    $build_cmd_fw ssrc_saluki-pi_flat
+    cp ${script_dir}/build/ssrc_saluki-pi_flat/ssrc_saluki-pi_flat.px4 ${dest_dir}/ssrc_saluki-pi_flat-${version}.px4
     ;;
   "saluki-pi_custom_keys")
     # on custom keys case we build _default target but SIGNING_ARGS env variable is set above in build_cmd_fw
     $build_cmd_fw ssrc_saluki-pi_default
     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_default_kernel-${version}.elf
     ;;
 
    *)