Skip to content

Commit efbe965

Browse files
committed
[ArmBackend] Fix in setup.sh for MacOS
Make sure setup continues if FVP's are already installed Change-Id: Ic35ca364c239e5795f9250ddb7621a3c5bae4bcf
1 parent 883ff14 commit efbe965

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

examples/arm/setup.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,16 @@ function setup_fvp() {
9696
shift; # drop this arg
9797
fi
9898
if [[ "${OS}" != "Linux" ]]; then
99-
echo "[${FUNCNAME[0]}] Warning: FVP only supported with Linux OS, skipping FVP setup..."
100-
echo "[${FUNCNAME[0]}] Warning: For MacOS, using https://github.com/Arm-Examples/FVPs-on-Mac is recommended."
101-
echo "[${FUNCNAME[0]}] Warning: Follow the instructions and make sure the path is set correctly."
102-
return 1
99+
# Check if FVP is callable
100+
if command -v FVP_Corstone_SSE-300_Ethos-U55 &> /dev/null; then
101+
echo "[${FUNCNAME[0]}] Info: FVP for MacOS seem to be installed. Continuing..."
102+
return 0 # If true exit gracefully and proceed with setup
103+
else
104+
echo "[${FUNCNAME[0]}] Warning: FVP only supported with Linux OS, skipping FVP setup..."
105+
echo "[${FUNCNAME[0]}] Warning: For MacOS, using https://github.com/Arm-Examples/FVPs-on-Mac is recommended."
106+
echo "[${FUNCNAME[0]}] Warning: Follow the instructions and make sure the path is set correctly."
107+
return 1 # Throw error. User need to install FVP according to ^^^
108+
fi
103109
fi
104110

105111
# Download and install the Corstone 300 FVP simulator platform

0 commit comments

Comments
 (0)