Fix

openthread · Jun 15, 2023 · 3df9d7c · 3df9d7c
1 parent 73f8588
commit 3df9d7c
Showing 1 changed file with 35 additions and 33 deletions.
diff --git a/script/make-firmware.bash b/script/make-firmware.bash
@@ -44,35 +44,6 @@ build_dir=""
 build_script_flags=()
 NRFUTIL=""
 
-readonly build_1_3_options_common=(
-    "-DOT_SRP_SERVER=ON"
-    "-DOT_ECDSA=ON"
-    "-DOT_SERVICE=ON"
-    "-DOT_DNSSD_SERVER=ON"
-    "-DOT_SRP_CLIENT=ON"
-)
-
-readonly build_1_3_options_efr32=(
-    ""
-)
-
-readonly build_1_3_options_nrf=(
-    ${build_1_2_options_nrf[@]}
-)
-
-readonly build_1_3_1_options_common=(
-    "-DOT_THREAD_VERSION=1.3.1"
-    ${build_1_3_options_common}
-)
-
-readonly build_1_3_1_options_efr32=(
-    ""
-)
-
-readonly build_1_3_1_options_nrf=(
-    ${build_1_3_options_nrf[@]}
-)
-
 readonly build_1_2_options_common=(
     '-DOT_THREAD_VERSION=1.2'
     '-DOT_REFERENCE_DEVICE=ON'
@@ -120,6 +91,35 @@ readonly build_1_1_env_nrf=(
     'USB=1'
 )
 
+readonly build_1_3_options_common=(
+    "-DOT_SRP_SERVER=ON"
+    "-DOT_ECDSA=ON"
+    "-DOT_SERVICE=ON"
+    "-DOT_DNSSD_SERVER=ON"
+    "-DOT_SRP_CLIENT=ON"
+)
+
+readonly build_1_3_options_efr32=(
+    ""
+)
+
+readonly build_1_3_options_nrf=(
+    ${build_1_2_options_nrf[@]}
+)
+
+readonly build_1_3_1_options_common=(
+    "-DOT_THREAD_VERSION=1.3.1"
+    ${build_1_3_options_common}
+)
+
+readonly build_1_3_1_options_efr32=(
+    ""
+)
+
+readonly build_1_3_1_options_nrf=(
+    ${build_1_3_options_nrf[@]}
+)
+
 # Args
 # - $1: The name of the hex file to zip
 # - $2: The basename of the file
@@ -298,17 +298,19 @@ build()
         case "${platform}" in
             nrf*)
                 option_name_nrf="build_${option_version}_options_nrf[@]"
-                options+=("${!option_name_nrf}")
+                options_nrf=${!option_name_nrf}
+                options+="${options_nrf[@]}"
                 platform_repo=ot-nrf528xx
 
-                thread_version="${REFERENCE_THREAD_VERSION}" build_type="USB_trans" build_ot "${options[@]}" "$@"
+                thread_version="${REFERENCE_THREAD_VERSION}" build_type="USB_trans" build_ot ${options[@]} "$@"
                 ;;
             efr32mg12)
                 option_name_efr32="build_${option_version}_options_efr32[@]"
-                options+=("${!option_name_efr32}")
+                options_efr32=${!option_name_efr32}
+                options+="${options_efr32[@]}"
                 platform_repo=ot-efr32
                 build_script_flags=("--skip-silabs-apps")
-                thread_version=1.2 build_ot "-DBOARD=brd4166a" "${options[@]}" "$@"
+                thread_version=1.2 build_ot "-DBOARD=brd4166a" ${options[@]} "$@"
                 ;;
         esac
     else