diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..499a6183 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.o +*.swp diff --git a/linux/stlink/lib/libstlink-shared.so b/linux/stlink/lib/libstlink-shared.so new file mode 120000 index 00000000..8e07ea86 --- /dev/null +++ b/linux/stlink/lib/libstlink-shared.so @@ -0,0 +1 @@ +libstlink-shared.so.1 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink-shared.so.1 b/linux/stlink/lib/libstlink-shared.so.1 new file mode 120000 index 00000000..1485c107 --- /dev/null +++ b/linux/stlink/lib/libstlink-shared.so.1 @@ -0,0 +1 @@ +libstlink-shared.so.1.3.0 \ No newline at end of file diff --git a/linux/stlink/lib/libstlink-shared.so.1.3.0 b/linux/stlink/lib/libstlink-shared.so.1.3.0 new file mode 100644 index 00000000..6337e7ab Binary files /dev/null and b/linux/stlink/lib/libstlink-shared.so.1.3.0 differ diff --git a/linux/stlink/lib/libstlink.a b/linux/stlink/lib/libstlink.a new file mode 100644 index 00000000..f89f075b Binary files /dev/null and b/linux/stlink/lib/libstlink.a differ diff --git a/linux/stlink/st-flash b/linux/stlink/st-flash index 951b11a3..6c1e57ae 100755 Binary files a/linux/stlink/st-flash and b/linux/stlink/st-flash differ diff --git a/linux/stlink/st-info b/linux/stlink/st-info index 0787606f..6f7bf387 100755 Binary files a/linux/stlink/st-info and b/linux/stlink/st-info differ diff --git a/linux/stlink/st-term b/linux/stlink/st-term deleted file mode 100755 index b5425db2..00000000 Binary files a/linux/stlink/st-term and /dev/null differ diff --git a/linux/stlink/st-util b/linux/stlink/st-util index c6a00786..cd3e5f73 100755 Binary files a/linux/stlink/st-util and b/linux/stlink/st-util differ diff --git a/linux/stlink_upload b/linux/stlink_upload index d72133a8..84fd24a0 100755 --- a/linux/stlink_upload +++ b/linux/stlink_upload @@ -1,6 +1,7 @@ #!/bin/bash +LD_LIBRARY_PATH=$(dirname $0)/stlink/lib if [ `uname -m` == "x86_64" ]; then - $(dirname $0)/../linux64/stlink/st-flash write "$4" 0x8000000 + $(dirname $0)/../linux64/stlink_upload $* else $(dirname $0)/stlink/st-flash write "$4" 0x8000000 fi diff --git a/linux64/stlink/lib/libstlink-shared.so b/linux64/stlink/lib/libstlink-shared.so new file mode 120000 index 00000000..8e07ea86 --- /dev/null +++ b/linux64/stlink/lib/libstlink-shared.so @@ -0,0 +1 @@ +libstlink-shared.so.1 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink-shared.so.1 b/linux64/stlink/lib/libstlink-shared.so.1 new file mode 120000 index 00000000..1485c107 --- /dev/null +++ b/linux64/stlink/lib/libstlink-shared.so.1 @@ -0,0 +1 @@ +libstlink-shared.so.1.3.0 \ No newline at end of file diff --git a/linux64/stlink/lib/libstlink-shared.so.1.3.0 b/linux64/stlink/lib/libstlink-shared.so.1.3.0 new file mode 100644 index 00000000..ce99960a Binary files /dev/null and b/linux64/stlink/lib/libstlink-shared.so.1.3.0 differ diff --git a/linux64/stlink/lib/libstlink.a b/linux64/stlink/lib/libstlink.a new file mode 100644 index 00000000..5dec5413 Binary files /dev/null and b/linux64/stlink/lib/libstlink.a differ diff --git a/linux64/stlink/st-flash b/linux64/stlink/st-flash index 9a0ac653..a95f4b41 100755 Binary files a/linux64/stlink/st-flash and b/linux64/stlink/st-flash differ diff --git a/linux64/stlink/st-info b/linux64/stlink/st-info index 3a5e5e80..21579757 100755 Binary files a/linux64/stlink/st-info and b/linux64/stlink/st-info differ diff --git a/linux64/stlink/st-term b/linux64/stlink/st-term deleted file mode 100755 index 8bdc1a61..00000000 Binary files a/linux64/stlink/st-term and /dev/null differ diff --git a/linux64/stlink/st-util b/linux64/stlink/st-util index 014919f1..9c032e6b 100755 Binary files a/linux64/stlink/st-util and b/linux64/stlink/st-util differ diff --git a/linux64/stlink_upload b/linux64/stlink_upload index f0dd789b..77574101 100755 --- a/linux64/stlink_upload +++ b/linux64/stlink_upload @@ -1,4 +1,5 @@ #!/bin/bash +LD_LIBRARY_PATH=$(dirname $0)/stlink/lib $(dirname $0)/stlink/st-flash write "$4" 0x8000000 exit 0 diff --git a/macosx/stlink/lib/libstlink-shared.1.3.0.dylib b/macosx/stlink/lib/libstlink-shared.1.3.0.dylib new file mode 100755 index 00000000..1c666561 Binary files /dev/null and b/macosx/stlink/lib/libstlink-shared.1.3.0.dylib differ diff --git a/macosx/stlink/lib/libstlink-shared.1.dylib b/macosx/stlink/lib/libstlink-shared.1.dylib new file mode 120000 index 00000000..f94f5cde --- /dev/null +++ b/macosx/stlink/lib/libstlink-shared.1.dylib @@ -0,0 +1 @@ +libstlink-shared.1.3.0.dylib \ No newline at end of file diff --git a/macosx/stlink/lib/libstlink-shared.dylib b/macosx/stlink/lib/libstlink-shared.dylib new file mode 120000 index 00000000..bdf7cc30 --- /dev/null +++ b/macosx/stlink/lib/libstlink-shared.dylib @@ -0,0 +1 @@ +libstlink-shared.1.dylib \ No newline at end of file diff --git a/macosx/stlink/lib/libstlink.a b/macosx/stlink/lib/libstlink.a new file mode 100644 index 00000000..e7f9e0e6 Binary files /dev/null and b/macosx/stlink/lib/libstlink.a differ diff --git a/macosx/stlink/st-flash b/macosx/stlink/st-flash index 6480b3f3..4dca84db 100755 Binary files a/macosx/stlink/st-flash and b/macosx/stlink/st-flash differ diff --git a/macosx/stlink/st-info b/macosx/stlink/st-info index 4e0ac305..14d1a8ba 100755 Binary files a/macosx/stlink/st-info and b/macosx/stlink/st-info differ diff --git a/macosx/stlink/st-term b/macosx/stlink/st-term deleted file mode 100755 index 9690069c..00000000 Binary files a/macosx/stlink/st-term and /dev/null differ diff --git a/macosx/stlink/st-util b/macosx/stlink/st-util index f37b666b..2925855a 100755 Binary files a/macosx/stlink/st-util and b/macosx/stlink/st-util differ diff --git a/macosx/stlink_upload b/macosx/stlink_upload index 7c107c79..191a5b32 100755 --- a/macosx/stlink_upload +++ b/macosx/stlink_upload @@ -1,2 +1,3 @@ #!/bin/bash +DYLD_LIBRARY_PATH=$(dirname $0)/stlink/lib $(dirname $0)/stlink/st-flash write "$4" 0x8000000