Fixed merge issues

2016-11-14 09:28:35 +11:00 · 2016-11-14 09:28:35 +11:00 · 83b18e0b76
commit 83b18e0b76
parent 243fb9cb8c bf2bb4cb76
42 changed files with 4 additions and 0 deletions
--- a/linux/dfu-util/dfu-prefix
+++ b/linux/dfu-util/dfu-prefix
--- a/linux/dfu-util/dfu-suffix
+++ b/linux/dfu-util/dfu-suffix
--- a/linux/dfu-util/dfu-util
+++ b/linux/dfu-util/dfu-util
--- a/linux/install.sh
+++ b/linux/install.sh
--- a/linux/maple_upload
+++ b/linux/maple_upload
--- a/linux/serial_upload
+++ b/linux/serial_upload
--- a/linux/stlink/st-flash
+++ b/linux/stlink/st-flash
--- a/linux/stlink/st-info
+++ b/linux/stlink/st-info
--- a/linux/stlink/st-term
+++ b/linux/stlink/st-term
--- a/linux/stlink/st-util
+++ b/linux/stlink/st-util
--- a/linux/stlink_upload
+++ b/linux/stlink_upload
--- a/linux/stm32flash/stm32flash
+++ b/linux/stm32flash/stm32flash
--- a/linux/upload-reset
+++ b/linux/upload-reset
--- a/linux/upload_router
+++ b/linux/upload_router
--- a/linux64/dfu-util/dfu-prefix
+++ b/linux64/dfu-util/dfu-prefix
--- a/linux64/dfu-util/dfu-suffix
+++ b/linux64/dfu-util/dfu-suffix
--- a/linux64/dfu-util/dfu-util
+++ b/linux64/dfu-util/dfu-util
--- a/linux64/install.sh
+++ b/linux64/install.sh
--- a/linux64/maple_upload
+++ b/linux64/maple_upload
--- a/linux64/nucleoFlasher/nucleoFlasher
+++ b/linux64/nucleoFlasher/nucleoFlasher
--- a/linux64/serial_upload
+++ b/linux64/serial_upload
--- a/linux64/stlink/st-flash
+++ b/linux64/stlink/st-flash
--- a/linux64/stlink/st-info
+++ b/linux64/stlink/st-info
--- a/linux64/stlink/st-term
+++ b/linux64/stlink/st-term
--- a/linux64/stlink/st-util
+++ b/linux64/stlink/st-util
--- a/linux64/stlink_upload
+++ b/linux64/stlink_upload
@ -1,4 +1,8 @@
 #!/bin/bash
+$(dirname $0)/stlink/st-flash write "$4" 0x8000000
+exit 0
+
+## Remove the lines 2 and 3 (above) if you want this script to wait until the Serial device has been enumerated and loaded before the script exits

 # Check for leaf device.
 function leaf_status()
--- a/linux64/stm32flash/stm32flash
+++ b/linux64/stm32flash/stm32flash
--- a/linux64/upload-reset
+++ b/linux64/upload-reset
--- a/linux64/upload_router
+++ b/linux64/upload_router
--- a/macos/dfu-util/dfu-prefix
+++ b/macos/dfu-util/dfu-prefix
--- a/macos/dfu-util/dfu-suffix
+++ b/macos/dfu-util/dfu-suffix
--- a/macos/dfu-util/dfu-util
+++ b/macos/dfu-util/dfu-util
--- a/macos/maple_upload
+++ b/macos/maple_upload
--- a/macos/serial_upload
+++ b/macos/serial_upload
--- a/macos/stlink/st-flash
+++ b/macos/stlink/st-flash
--- a/macos/stlink/st-info
+++ b/macos/stlink/st-info
--- a/macos/stlink/st-term
+++ b/macos/stlink/st-term
--- a/macos/stlink/st-util
+++ b/macos/stlink/st-util
--- a/macos/stlink_upload
+++ b/macos/stlink_upload
--- a/macos/stm32flash/stm32flash
+++ b/macos/stm32flash/stm32flash
--- a/macos/upload-reset
+++ b/macos/upload-reset
--- a/macos/upload_router
+++ b/macos/upload_router