Skip to content

Commit d0fe98b

Browse files
committed
Fixes for portability
1 parent 5b43fcc commit d0fe98b

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

tools/scripts/va416x0/build_test.sh

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@ MODE=$1
1616
# Set version: default to 1 for clean, default to 2 for update
1717
VERSION=$([ "$MODE" = "clean" ] && echo "${2:-1}" || echo "${2:-2}")
1818

19+
# Find JLinkExe (in PATH on Linux, /Applications/SEGGER on macOS)
20+
if command -v JLinkExe &> /dev/null; then
21+
JLINK="JLinkExe"
22+
else
23+
# Check for versioned JLink directory on macOS (e.g., JLink_V812g)
24+
JLINK_PATH=$(find /Applications/SEGGER -name "JLinkExe" 2>/dev/null | head -n1)
25+
if [ -n "$JLINK_PATH" ] && [ -x "$JLINK_PATH" ]; then
26+
JLINK="$JLINK_PATH"
27+
else
28+
echo "Error: JLinkExe not found. Please install SEGGER J-Link software."
29+
exit 1
30+
fi
31+
fi
32+
1933
# Function to get value from .config file
2034
get_config_value() {
2135
grep "^${1}" .config | sed -E "s/^${1}[?]?=//" | head -n1
@@ -27,8 +41,8 @@ UPDATE_ADDRESS=$(get_config_value "WOLFBOOT_PARTITION_UPDATE_ADDRESS")
2741
IMAGE_HEADER_SIZE=$(get_config_value "IMAGE_HEADER_SIZE")
2842
SIGN=$(get_config_value "SIGN")
2943
HASH=$(get_config_value "HASH")
30-
SIGN_ARG="--${SIGN,,}"
31-
HASH_ARG="--${HASH,,}"
44+
SIGN_ARG="--$(echo "${SIGN}" | tr '[:upper:]' '[:lower:]')"
45+
HASH_ARG="--$(echo "${HASH}" | tr '[:upper:]' '[:lower:]')"
3246

3347
# Common build steps
3448
make clean && make wolfboot.bin && make test-app/image.bin
@@ -57,7 +71,7 @@ if [ "$MODE" = "clean" ]; then
5771
./tools/bin-assemble/bin-assemble factory.bin 0x0 wolfboot.bin \
5872
${BOOT_ADDRESS} test-app/image_v${VERSION}_signed.bin \
5973
${UPDATE_ADDRESS} blank_update.bin
60-
JLinkExe -CommanderScript tools/scripts/va416x0/flash_va416xx.jlink
74+
${JLINK} -CommanderScript tools/scripts/va416x0/flash_va416xx.jlink
6175
print_summary
6276
else
6377
PARTITION_SIZE=$(get_config_value "WOLFBOOT_PARTITION_SIZE")
@@ -69,6 +83,6 @@ else
6983
${BOOT_ADDRESS} test-app/image_v${PREV_VERSION}_signed.bin \
7084
${UPDATE_ADDRESS} test-app/image_v${VERSION}_signed.bin \
7185
${TRIGGER_ADDRESS} trigger_magic.bin
72-
JLinkExe -CommanderScript tools/scripts/va416x0/flash_va416xx_update.jlink
86+
${JLINK} -CommanderScript tools/scripts/va416x0/flash_va416xx_update.jlink
7387
print_summary "${TRIGGER_ADDRESS}" "${PREV_VERSION}"
7488
fi

0 commit comments

Comments
 (0)