Fix stlink upload scripts

mcci-catena · May 7, 2021 · 3d6f75a · 3d6f75a
1 parent bea7343
commit 3d6f75a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tools/linux/stlink_upload b/tools/linux/stlink_upload
@@ -95,7 +95,7 @@ fi
 
 # cater to system differences
 if [[ "$(uname)" = "Darwin" ]]; then
-    export DYLD_LIBRARY_PATH="$TOOLDIR/stlink/lib"
+    DYLD_LIBRARY_PATH="$TOOLDIR/stlink/lib"
 else
   if [[ "$(uname -m)" = "x86_64" ]]; then
     TOOLDIR="$(dirname "$TOOLDIR")/linux64"
@@ -105,14 +105,14 @@ fi
 
 # upload the bootloader
 if [[ "$BOOTLOADER" != "-" ]]; then
-    if ! "$TOOLDIR"/stlink/st-flash write "$BOOTLOADER" 0x0x08000000; then
+    if ! "$TOOLDIR"/stlink/st-flash --format binary write "$BOOTLOADER" 0x08000000 ; then
         echo "Error uploading bootloader"
         exit 1
     fi
 fi
 
 # upload the main file
-if ! "$TOOLDIR"/stlink/st-flash write "$FILE" "$BASEADDR"; then
+if ! "$TOOLDIR"/stlink/st-flash --format binary write "$FILE" "$BASEADDR" ; then
     echo "Error uploading $FILE"
     exit 1
 fi

diff --git a/tools/macosx/stlink_upload b/tools/macosx/stlink_upload
@@ -95,7 +95,7 @@ fi
 
 # cater to system differences
 if [[ "$(uname)" = "Darwin" ]]; then
-    export DYLD_LIBRARY_PATH="$TOOLDIR/stlink/lib"
+    DYLD_LIBRARY_PATH="$TOOLDIR/stlink/lib"
 else
   if [[ "$(uname -m)" = "x86_64" ]]; then
     TOOLDIR="$(dirname "$TOOLDIR")/linux64"
@@ -105,14 +105,14 @@ fi
 
 # upload the bootloader
 if [[ "$BOOTLOADER" != "-" ]]; then
-    if ! "$TOOLDIR"/stlink/st-flash write "$BOOTLOADER" 0x0x08000000; then
+    if ! "$TOOLDIR"/stlink/st-flash --format binary write "$BOOTLOADER" 0x08000000 ; then
         echo "Error uploading bootloader"
         exit 1
     fi
 fi
 
 # upload the main file
-if ! "$TOOLDIR"/stlink/st-flash write "$FILE" "$BASEADDR"; then
+if ! "$TOOLDIR"/stlink/st-flash --format binary write "$FILE" "$BASEADDR" ; then
     echo "Error uploading $FILE"
     exit 1
 fi