Addressing some comments

Author: BujSet

.ci/scripts/setup-arm-zephyr-x86-64-tools.sh

@@ -8,4 +8,4 @@
 # Setup arm example environment (including TOSA tools)
 git config --global user.email "[email protected]"
 git config --global user.name "Github Executorch"
-bash examples/arm/setup.sh --i-agree-to-the-contained-eula --user-toolchain-url "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz" --user-toolchain-dir "arm-zephyr-eabi"
+bash examples/arm/setup.sh --i-agree-to-the-contained-eula  --target-toolchain zephyr

examples/arm/setup.sh

@@ -202,26 +202,41 @@ function setup_fvp() {
 
 function select_toolchain() {
     if [[ "${ARCH}" == "x86_64" ]]; then
-	if [[ "${target_toolchain}" == "zephyr" ]]; then
-	    # TODO can include support for zephyr toolchain for other host platforms later
-            toolchain_url="https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz"
-            toolchain_dir="arm-zephyr-eabi"
-            toolchain_md5_checksum="93128be0235cf5cf5f1ee561aa6eac5f"
+        if [[ "${OS}" == "Linux" ]]; then
+	    if [[ "${target_toolchain}" == "zephyr" ]]; then
+	        # TODO can include support for zephyr toolchain for other host platforms later
+                toolchain_url="https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz"
+                toolchain_dir="arm-zephyr-eabi"
+                toolchain_md5_checksum="93128be0235cf5cf5f1ee561aa6eac5f"
+            else
+                toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz"
+                toolchain_dir="arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi"
+                toolchain_md5_checksum="0601a9588bc5b9c99ad2b56133b7f118"
+                echo "[main] Info using bare metal toolchain for default host OS ${OS} selection"
+	    fi
         else
-            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz"
-            toolchain_dir="arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi"
-            toolchain_md5_checksum="0601a9588bc5b9c99ad2b56133b7f118"
-            echo "[main] Info using bare metal toolchain for default host OS ${OS} selection"
+            echo "[main] Error: only Linux is currently supported for x86-64 architecture now!"; exit 1;
 	fi
    elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]; then
         if [[ "${OS}" == "Darwin" ]]; then
-            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz"
-            toolchain_dir="arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi"
-            toolchain_md5_checksum="f1c18320bb3121fa89dca11399273f4e"
+	    if [[ "${target_toolchain}" == "zephyr" ]]; then
+                echo "[main] Error: only Linux OS is currently supported for aarch64 architecture targeting Zephyr now!"; exit 1;
+	    else
+                toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz"
+                toolchain_dir="arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi"
+                toolchain_md5_checksum="f1c18320bb3121fa89dca11399273f4e"
+	    fi
         elif [[ "${OS}" == "Linux" ]]; then
-            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz"
-            toolchain_dir="arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi"
-            toolchain_md5_checksum="303102d97b877ebbeb36b3158994b218"
+	    if [[ "${target_toolchain}" == "zephyr" ]]; then
+	        # WARNING this path is untested, but should work
+                toolchain_url="https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-aarch64_arm-zephyr-eabi.tar.xz"
+                toolchain_dir="arm-zephyr-eabi"
+                toolchain_md5_checksum="ef4ca56786204439a75270ba800cc64b"
+	    else
+                toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz"
+                toolchain_dir="arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi"
+                toolchain_md5_checksum="303102d97b877ebbeb36b3158994b218"
+	    fi
         fi
     else
         echo "[main] Error: only x86-64 & aarch64/arm64 architecture is supported for now!"; exit 1;
@@ -237,7 +252,7 @@ function setup_toolchain() {
         verify_md5 ${toolchain_md5_checksum} "${toolchain_dir}.tar.xz" || exit 1
     fi
 
-    echo "[${FUNCNAME[0]}] Installing toolchain ..."
+    echo "[${FUNCNAME[0]}] Installing ${toolchain_dir} toolchain ..."
     rm -rf "${toolchain_dir}"
     tar xf "${toolchain_dir}.tar.xz"
 }