diff --git a/linux/49-stlinkv1.rules b/linux/49-stlinkv1.rules
deleted file mode 100644
index d474d6a40..000000000
--- a/linux/49-stlinkv1.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# stm32 discovery boards, with onboard st/linkv1
-# ie, STM32VL
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv1_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux/49-stlinkv2-1.rules b/linux/49-stlinkv2-1.rules
deleted file mode 100644
index a5a79b91c..000000000
--- a/linux/49-stlinkv2-1.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# stm32 nucleo boards, with onboard st/linkv2-1
-# ie, STM32F0, STM32F4.
-# STM32VL has st/linkv1, which is quite different
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv2-1_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux/49-stlinkv2.rules b/linux/49-stlinkv2.rules
deleted file mode 100644
index a11215c57..000000000
--- a/linux/49-stlinkv2.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# stm32 discovery boards, with onboard st/linkv2
-# ie, STM32L, STM32F4.
-# STM32VL has st/linkv1, which is quite different
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv2_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux/install.sh b/linux/install.sh
index 29ddb2f22..32870a1c2 100755
--- a/linux/install.sh
+++ b/linux/install.sh
@@ -5,15 +5,6 @@ if sudo [ -w /etc/udev/rules.d ]; then
     sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
     sudo chown root:root /etc/udev/rules.d/45-maple.rules
     sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-    sudo cp -v 49-stlinkv1.rules /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv1.rules
-    sudo cp -v 49-stlinkv2.rules /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2.rules
-    sudo cp -v 49-stlinkv2-1.rules /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2-1.rules
     echo "Reloading udev rules"
     sudo udevadm control --reload-rules
     echo "Adding current user to dialout group"
diff --git a/linux/readme.txt b/linux/readme.txt
deleted file mode 100644
index 2d13beb3c..000000000
--- a/linux/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The maple upload script needs its rights to be set to 755 
\ No newline at end of file
diff --git a/linux/serial_upload b/linux/serial_upload
deleted file mode 100755
index 4d0a386c5..000000000
--- a/linux/serial_upload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-$(dirname $0)/stm32flash/stm32flash -g 0x8000000 -b 115200 -w "$4" /dev/"$1"
diff --git a/linux/stlink/lib/libstlink.a b/linux/stlink/lib/libstlink.a
deleted file mode 100644
index 4b065dc19..000000000
Binary files a/linux/stlink/lib/libstlink.a and /dev/null differ
diff --git a/linux/stlink/lib/libstlink.so b/linux/stlink/lib/libstlink.so
deleted file mode 120000
index cd2d3010e..000000000
--- a/linux/stlink/lib/libstlink.so
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.so.1
\ No newline at end of file
diff --git a/linux/stlink/lib/libstlink.so.1 b/linux/stlink/lib/libstlink.so.1
deleted file mode 120000
index 51934773a..000000000
--- a/linux/stlink/lib/libstlink.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.so.1.5.1
\ No newline at end of file
diff --git a/linux/stlink/lib/libstlink.so.1.5.1 b/linux/stlink/lib/libstlink.so.1.5.1
deleted file mode 100644
index e81060c4b..000000000
Binary files a/linux/stlink/lib/libstlink.so.1.5.1 and /dev/null differ
diff --git a/linux/stlink/st-flash b/linux/stlink/st-flash
deleted file mode 100755
index ea0bae602..000000000
Binary files a/linux/stlink/st-flash and /dev/null differ
diff --git a/linux/stlink/st-info b/linux/stlink/st-info
deleted file mode 100755
index 55e33f761..000000000
Binary files a/linux/stlink/st-info and /dev/null differ
diff --git a/linux/stlink/st-util b/linux/stlink/st-util
deleted file mode 100755
index 151a68ff6..000000000
Binary files a/linux/stlink/st-util and /dev/null differ
diff --git a/linux/stlink_upload b/linux/stlink_upload
deleted file mode 100755
index 84fd24a00..000000000
--- a/linux/stlink_upload
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$(dirname $0)/stlink/lib
-if [ `uname -m` ==  "x86_64" ]; then
-  $(dirname $0)/../linux64/stlink_upload $*
-else
-  $(dirname $0)/stlink/st-flash write "$4" 0x8000000
-fi
-exit 0
-
-## Remove the lines 2 to 7 (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()
-{
-
-this_leaf_status=$(lsusb |grep "1eaf" | awk '{ print $NF}')
-# Find the mode of the leaf bootloader
-case $this_leaf_status in
-   "1eaf:0003")
-      echo "dfu"
-   ;;
-   "1eaf:0004")
-      echo "ttyACMx"
-   ;;
-   *)
-      #echo "$this_leaf_status"
-      echo "unknown"
-   ;;
-esac
-}
-
-# You will need the usb-reset code, see https://github.com/rogerclarkmelbourne/Arduino_STM32/wiki/Using-a-generic-stm32-board-on-linux-with-Maple-bootloader
-#
-USBRESET=$(which usb-reset) || USBRESET="./usb-reset"
-
-# Check to see if a maple compatible board is attached
-LEAF_STATUS=$(leaf_status)
-echo "USB Status [$LEAF_STATUS]"
-
-$(dirname $0)/stlink/st-flash write "$4" 0x8000000
-
-sleep 4
-# Reset the usb device to bring up the tty rather than DFU
-"$USBRESET" "/dev/bus/usb/$(lsusb |grep "1eaf" |awk '{print $2,$4}'|sed 's/\://g'|sed 's/ /\//g')" >/dev/null 2>&1
-# Check to see if a maple compatible board is attached
-LEAF_STATUS=$(leaf_status)
-echo "USB Status [$LEAF_STATUS]"
-# Check to see if the tty came up
-TTY_DEV=$(find /dev -cmin -2 |grep ttyAC)
-echo -e "Waiting for tty device $TTY_DEV \n"
-sleep 20
-echo -e "$TTY_DEV should now be available.\n"
-exit 0
-
diff --git a/linux/stm32CubeProg.sh b/linux/stm32CubeProg.sh
new file mode 100755
index 000000000..ff9a7b802
--- /dev/null
+++ b/linux/stm32CubeProg.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+set -o nounset                              # Treat unset variables as an error
+#set -x
+STM32CP_CLI=STM32_Programmer.sh
+ADDRESS=0x8000000
+FILEPATH=
+MODE=
+PORT=
+OPTS=
+
+###############################################################################
+## Help function
+usage()
+{
+  echo "############################################################"
+  echo "##"
+  echo "## `basename $0` <protocol> <file_path> [OPTIONS]"
+  echo "##"
+  echo "## protocol: "
+  echo "##   0: SWD"
+  echo "##   1: Serial "
+  echo "##   2: DFU"
+  echo "## file_path: file path name to be downloaded: (bin, hex)"
+  echo "## Options:"
+  echo "##   For SWD: -rst"
+  echo "##     -rst: Reset system (default)"
+  echo "##   For Serial: <com_port> -s"
+  echo "##     com_port: serial identifier. Ex: /dev/ttyS0"
+  echo "##     -s: start automatically"
+  echo "##   For DFU: none"
+  echo "############################################################"
+  exit $1
+}
+
+
+check_tool() {
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    export PATH="$HOME/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin":$PATH
+  fi
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    echo "$STM32CP_CLI not found."
+    echo "Please install it or add '<STM32CubeProgrammer path>/bin' to your PATH environment:"
+    echo "https://www.st.com/en/development-tools/stm32cubeprog.html"
+    echo "Aborting!"
+    exit 1
+  fi
+}
+
+check_tool
+
+if [ $# -lt 2 ]; then
+    echo "Not enough arguments!"
+    usage 2
+fi
+
+FILEPATH=$2
+
+# Parse options
+# Protocol $1
+# 0: SWD
+# 1: Serial
+# 2: DFU
+case $1 in
+  0)
+    PORT='SWD'
+    MODE='mode=UR'
+    if [ $# -lt 3 ]; then
+      OPTS=-rst
+    else
+      OPTS=$3
+    fi;;
+  1)
+    if [ $# -lt 3 ]; then
+      usage 3
+    else
+      PORT=$3
+      if [ $# -gt 3 ]; then
+        shift 3
+        OPTS="$@"
+      fi
+    fi;;
+  2)
+    PORT='USB1';;
+  *)
+    echo "Protocol unknown!"
+    usage 4;;
+esac
+
+${STM32CP_CLI} -c port=${PORT} ${MODE} -q -d ${FILEPATH} ${ADDRESS} ${OPTS}
+
+exit 0
+
diff --git a/linux/stm32flash/stm32flash b/linux/stm32flash/stm32flash
deleted file mode 100755
index 21abb6e38..000000000
Binary files a/linux/stm32flash/stm32flash and /dev/null differ
diff --git a/linux64/49-stlinkv1.rules b/linux64/49-stlinkv1.rules
deleted file mode 100644
index d474d6a40..000000000
--- a/linux64/49-stlinkv1.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# stm32 discovery boards, with onboard st/linkv1
-# ie, STM32VL
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv1_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux64/49-stlinkv2-1.rules b/linux64/49-stlinkv2-1.rules
deleted file mode 100644
index a5a79b91c..000000000
--- a/linux64/49-stlinkv2-1.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# stm32 nucleo boards, with onboard st/linkv2-1
-# ie, STM32F0, STM32F4.
-# STM32VL has st/linkv1, which is quite different
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv2-1_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux64/49-stlinkv2.rules b/linux64/49-stlinkv2.rules
deleted file mode 100644
index a11215c57..000000000
--- a/linux64/49-stlinkv2.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# stm32 discovery boards, with onboard st/linkv2
-# ie, STM32L, STM32F4.
-# STM32VL has st/linkv1, which is quite different
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", \
-    MODE:="0666", \
-    SYMLINK+="stlinkv2_%n"
-
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
diff --git a/linux64/install.sh b/linux64/install.sh
index 29ddb2f22..32870a1c2 100755
--- a/linux64/install.sh
+++ b/linux64/install.sh
@@ -5,15 +5,6 @@ if sudo [ -w /etc/udev/rules.d ]; then
     sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
     sudo chown root:root /etc/udev/rules.d/45-maple.rules
     sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-    sudo cp -v 49-stlinkv1.rules /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv1.rules
-    sudo cp -v 49-stlinkv2.rules /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2.rules
-    sudo cp -v 49-stlinkv2-1.rules /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chown root:root /etc/udev/rules.d/49-stlinkv2-1.rules
-    sudo chmod 644 /etc/udev/rules.d/49-stlinkv2-1.rules
     echo "Reloading udev rules"
     sudo udevadm control --reload-rules
     echo "Adding current user to dialout group"
diff --git a/linux64/readme.txt b/linux64/readme.txt
deleted file mode 100644
index 2d13beb3c..000000000
--- a/linux64/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The maple upload script needs its rights to be set to 755 
\ No newline at end of file
diff --git a/linux64/serial_upload b/linux64/serial_upload
deleted file mode 100755
index 4d0a386c5..000000000
--- a/linux64/serial_upload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-$(dirname $0)/stm32flash/stm32flash -g 0x8000000 -b 115200 -w "$4" /dev/"$1"
diff --git a/linux64/stlink/lib/libstlink.a b/linux64/stlink/lib/libstlink.a
deleted file mode 100644
index 9d53bd54a..000000000
Binary files a/linux64/stlink/lib/libstlink.a and /dev/null differ
diff --git a/linux64/stlink/lib/libstlink.so b/linux64/stlink/lib/libstlink.so
deleted file mode 120000
index cd2d3010e..000000000
--- a/linux64/stlink/lib/libstlink.so
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.so.1
\ No newline at end of file
diff --git a/linux64/stlink/lib/libstlink.so.1 b/linux64/stlink/lib/libstlink.so.1
deleted file mode 120000
index 51934773a..000000000
--- a/linux64/stlink/lib/libstlink.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.so.1.5.1
\ No newline at end of file
diff --git a/linux64/stlink/lib/libstlink.so.1.5.1 b/linux64/stlink/lib/libstlink.so.1.5.1
deleted file mode 100755
index f7c55a25b..000000000
Binary files a/linux64/stlink/lib/libstlink.so.1.5.1 and /dev/null differ
diff --git a/linux64/stlink/st-flash b/linux64/stlink/st-flash
deleted file mode 100755
index f0454d595..000000000
Binary files a/linux64/stlink/st-flash and /dev/null differ
diff --git a/linux64/stlink/st-info b/linux64/stlink/st-info
deleted file mode 100755
index ab3d1fb8e..000000000
Binary files a/linux64/stlink/st-info and /dev/null differ
diff --git a/linux64/stlink/st-util b/linux64/stlink/st-util
deleted file mode 100755
index e29aa16b2..000000000
Binary files a/linux64/stlink/st-util and /dev/null differ
diff --git a/linux64/stlink_upload b/linux64/stlink_upload
deleted file mode 100755
index 49d4ddaec..000000000
--- a/linux64/stlink_upload
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$(dirname $0)/stlink/lib
-$(dirname $0)/stlink/st-flash write "$4" 0x8000000
-exit 0
-
-# Check for leaf device.
-function leaf_status()
-{
-
-this_leaf_status=$(lsusb |grep "1eaf" | awk '{ print $NF}')
-# Find the mode of the leaf bootloader
-case $this_leaf_status in
-   "1eaf:0003")
-      echo "dfu"
-   ;;
-   "1eaf:0004")
-      echo "ttyACMx"
-   ;;
-   *)
-      #echo "$this_leaf_status"
-      echo "unknown"
-   ;;
-esac
-}
-
-# You will need the usb-reset code, see https://github.com/rogerclarkmelbourne/Arduino_STM32/wiki/Using-a-generic-stm32-board-on-linux-with-Maple-bootloader
-#
-USBRESET=$(which usb-reset) || USBRESET="./usb-reset"
-
-# Check to see if a maple compatible board is attached
-LEAF_STATUS=$(leaf_status)
-echo "USB Status [$LEAF_STATUS]"
-
-$(dirname $0)/stlink/st-flash write "$4" 0x8000000
-
-sleep 4
-# Reset the usb device to bring up the tty rather than DFU
-"$USBRESET" "/dev/bus/usb/$(lsusb |grep "1eaf" |awk '{print $2,$4}'|sed 's/\://g'|sed 's/ /\//g')" >/dev/null 2>&1
-# Check to see if a maple compatible board is attached
-LEAF_STATUS=$(leaf_status)
-echo "USB Status [$LEAF_STATUS]"
-# Check to see if the tty came up
-TTY_DEV=$(find /dev -cmin -2 |grep ttyAC)
-echo -e "Waiting for tty device $TTY_DEV \n"
-sleep 20
-echo -e "$TTY_DEV should now be available.\n"
-exit 0
-
diff --git a/linux64/stm32flash/stm32flash b/linux64/stm32flash/stm32flash
deleted file mode 100755
index f1a848ded..000000000
Binary files a/linux64/stm32flash/stm32flash and /dev/null differ
diff --git a/macosx/serial_upload b/macosx/serial_upload
deleted file mode 100755
index 4d0a386c5..000000000
--- a/macosx/serial_upload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-$(dirname $0)/stm32flash/stm32flash -g 0x8000000 -b 115200 -w "$4" /dev/"$1"
diff --git a/macosx/stlink/lib/libstlink.1.5.1.dylib b/macosx/stlink/lib/libstlink.1.5.1.dylib
deleted file mode 100755
index 45a8a928f..000000000
Binary files a/macosx/stlink/lib/libstlink.1.5.1.dylib and /dev/null differ
diff --git a/macosx/stlink/lib/libstlink.1.dylib b/macosx/stlink/lib/libstlink.1.dylib
deleted file mode 120000
index 17bda6767..000000000
--- a/macosx/stlink/lib/libstlink.1.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.1.5.1.dylib
\ No newline at end of file
diff --git a/macosx/stlink/lib/libstlink.a b/macosx/stlink/lib/libstlink.a
deleted file mode 100644
index ebf35cd1b..000000000
Binary files a/macosx/stlink/lib/libstlink.a and /dev/null differ
diff --git a/macosx/stlink/lib/libstlink.dylib b/macosx/stlink/lib/libstlink.dylib
deleted file mode 120000
index 9891f18f1..000000000
--- a/macosx/stlink/lib/libstlink.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libstlink.1.dylib
\ No newline at end of file
diff --git a/macosx/stlink/st-flash b/macosx/stlink/st-flash
deleted file mode 100755
index 08224f53f..000000000
Binary files a/macosx/stlink/st-flash and /dev/null differ
diff --git a/macosx/stlink/st-info b/macosx/stlink/st-info
deleted file mode 100755
index d8f8e4239..000000000
Binary files a/macosx/stlink/st-info and /dev/null differ
diff --git a/macosx/stlink/st-util b/macosx/stlink/st-util
deleted file mode 100755
index fdd9040b7..000000000
Binary files a/macosx/stlink/st-util and /dev/null differ
diff --git a/macosx/stlink_upload b/macosx/stlink_upload
deleted file mode 100755
index 191a5b325..000000000
--- a/macosx/stlink_upload
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DYLD_LIBRARY_PATH=$(dirname $0)/stlink/lib
-$(dirname $0)/stlink/st-flash write "$4" 0x8000000 
diff --git a/macosx/stm32CubeProg b/macosx/stm32CubeProg
new file mode 100755
index 000000000..cfa71bf61
--- /dev/null
+++ b/macosx/stm32CubeProg
@@ -0,0 +1,93 @@
+#!/bin/bash
+set -o nounset                              # Treat unset variables as an error
+STM32CP_CLI=STM32_Programmer_CLI
+ADDRESS=0x8000000
+FILEPATH=
+MODE=
+PORT=
+OPTS=
+
+###############################################################################
+## Help function
+usage()
+{
+  echo "############################################################"
+  echo "##"
+  echo "## `basename $0` <protocol> <file_path> [OPTIONS]"
+  echo "##"
+  echo "## protocol: "
+  echo "##   0: SWD"
+  echo "##   1: Serial "
+  echo "##   2: DFU"
+  echo "## file_path: file path name to be downloaded: (bin, hex)"
+  echo "## Options:"
+  echo "##   For SWD: -rst"
+  echo "##     -rst: Reset system (default)"
+  echo "##   For Serial: <com_port> -s"
+  echo "##     com_port: serial identifier. Ex: /dev/ttyS0"
+  echo "##     -s: start automatically"
+  echo "##   For DFU: none"
+  echo "############################################################"
+  exit $1
+}
+
+
+check_tool() {
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    export PATH="/Applications/STMicroelectronics/STM32Cube/STM32CubeProgrammer/STM32CubeProgrammer.app/Contents/MacOs/bin":$PATH
+  fi
+  command -v $STM32CP_CLI >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    echo "$STM32CP_CLI not found."
+    echo "Please install it or add '<STM32CubeProgrammer path>/bin' to your PATH environment:"
+    echo "https://www.st.com/en/development-tools/stm32cubeprog.html"
+    echo "Aborting!"
+    exit 1
+  fi
+}
+
+check_tool
+
+if [ $# -lt 2 ]; then
+    echo "Not enough arguments!"
+    usage 2
+fi
+
+FILEPATH=$2
+
+# Parse options
+# Protocol $1
+# 0: SWD
+# 1: Serial
+# 2: DFU
+case $1 in
+  0)
+    PORT='SWD'
+    MODE='mode=UR'
+    if [ $# -lt 3 ]; then
+      OPTS=-rst
+    else
+      OPTS=$3
+    fi;;
+  1)
+    if [ $# -lt 3 ]; then
+      usage 3
+    else
+      PORT=$3
+      if [ $# -gt 3 ]; then
+	shift 3
+        OPTS="$@"
+      fi
+    fi;;
+  2)
+    PORT='USB1';;
+  *)
+    echo "Protocol unknown!"
+    usage 4;;
+esac
+
+${STM32CP_CLI} -c port=${PORT} ${MODE} -q -d ${FILEPATH} ${ADDRESS} ${OPTS}
+
+exit 0
+
diff --git a/macosx/stm32flash/stm32flash b/macosx/stm32flash/stm32flash
deleted file mode 100755
index 8176d233e..000000000
Binary files a/macosx/stm32flash/stm32flash and /dev/null differ
diff --git a/win/serial_upload.bat b/win/serial_upload.bat
deleted file mode 100644
index 9226e3219..000000000
--- a/win/serial_upload.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-rem: Note %~dp0 get path of this batch file
-rem: Need to change drive if My Documents is on a drive other than C:
-set driverLetter=%~dp0
-set driverLetter=%driverLetter:~0,2%
-%driverLetter%
-cd %~dp0
-rem: the two line below are needed to fix path issues with incorrect slashes before the bin file name
-set str=%4
-set str=%str:/=\%
-stm32flash\stm32flash.exe -g 0x8000000 -b 115200 -w %str% %1
diff --git a/win/stlink/Docs/ST-LINK Utility UM.pdf b/win/stlink/Docs/ST-LINK Utility UM.pdf
deleted file mode 100644
index 55b7fcba3..000000000
Binary files a/win/stlink/Docs/ST-LINK Utility UM.pdf and /dev/null differ
diff --git a/win/stlink/Docs/STLink_UM.pdf b/win/stlink/Docs/STLink_UM.pdf
deleted file mode 100644
index 2c659bd86..000000000
Binary files a/win/stlink/Docs/STLink_UM.pdf and /dev/null differ
diff --git a/win/stlink/Docs/Software license agreement.pdf b/win/stlink/Docs/Software license agreement.pdf
deleted file mode 100644
index 6f26ebf69..000000000
Binary files a/win/stlink/Docs/Software license agreement.pdf and /dev/null differ
diff --git a/win/stlink/Docs/UM1075.pdf b/win/stlink/Docs/UM1075.pdf
deleted file mode 100644
index 8a34a8949..000000000
Binary files a/win/stlink/Docs/UM1075.pdf and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x410.stldr b/win/stlink/FlashLoader/0x410.stldr
deleted file mode 100644
index db6e6f590..000000000
Binary files a/win/stlink/FlashLoader/0x410.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x411.stldr b/win/stlink/FlashLoader/0x411.stldr
deleted file mode 100644
index af4671358..000000000
Binary files a/win/stlink/FlashLoader/0x411.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x412.stldr b/win/stlink/FlashLoader/0x412.stldr
deleted file mode 100644
index 58728d875..000000000
Binary files a/win/stlink/FlashLoader/0x412.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x413.stldr b/win/stlink/FlashLoader/0x413.stldr
deleted file mode 100644
index 997277b68..000000000
Binary files a/win/stlink/FlashLoader/0x413.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x414.stldr b/win/stlink/FlashLoader/0x414.stldr
deleted file mode 100644
index 4b6729aa5..000000000
Binary files a/win/stlink/FlashLoader/0x414.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x415.stldr b/win/stlink/FlashLoader/0x415.stldr
deleted file mode 100644
index 17429f030..000000000
Binary files a/win/stlink/FlashLoader/0x415.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x416.stldr b/win/stlink/FlashLoader/0x416.stldr
deleted file mode 100644
index c72af2650..000000000
Binary files a/win/stlink/FlashLoader/0x416.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x417.stldr b/win/stlink/FlashLoader/0x417.stldr
deleted file mode 100644
index 0ef285bb6..000000000
Binary files a/win/stlink/FlashLoader/0x417.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x418.stldr b/win/stlink/FlashLoader/0x418.stldr
deleted file mode 100644
index d047b48d3..000000000
Binary files a/win/stlink/FlashLoader/0x418.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x419.stldr b/win/stlink/FlashLoader/0x419.stldr
deleted file mode 100644
index 3c0be227a..000000000
Binary files a/win/stlink/FlashLoader/0x419.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x419_DB1M_On.stldr b/win/stlink/FlashLoader/0x419_DB1M_On.stldr
deleted file mode 100644
index 2c276bb5a..000000000
Binary files a/win/stlink/FlashLoader/0x419_DB1M_On.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x420.stldr b/win/stlink/FlashLoader/0x420.stldr
deleted file mode 100644
index 27df693cc..000000000
Binary files a/win/stlink/FlashLoader/0x420.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x421.stldr b/win/stlink/FlashLoader/0x421.stldr
deleted file mode 100644
index a942da972..000000000
Binary files a/win/stlink/FlashLoader/0x421.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x422.stldr b/win/stlink/FlashLoader/0x422.stldr
deleted file mode 100644
index 87fb729c9..000000000
Binary files a/win/stlink/FlashLoader/0x422.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x423.stldr b/win/stlink/FlashLoader/0x423.stldr
deleted file mode 100644
index f20655cdd..000000000
Binary files a/win/stlink/FlashLoader/0x423.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x425.stldr b/win/stlink/FlashLoader/0x425.stldr
deleted file mode 100644
index 937b3d8b4..000000000
Binary files a/win/stlink/FlashLoader/0x425.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x427.stldr b/win/stlink/FlashLoader/0x427.stldr
deleted file mode 100644
index 3b1ddd21e..000000000
Binary files a/win/stlink/FlashLoader/0x427.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x428.stldr b/win/stlink/FlashLoader/0x428.stldr
deleted file mode 100644
index 003ee6177..000000000
Binary files a/win/stlink/FlashLoader/0x428.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x429.stldr b/win/stlink/FlashLoader/0x429.stldr
deleted file mode 100644
index 8658549c6..000000000
Binary files a/win/stlink/FlashLoader/0x429.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x430.stldr b/win/stlink/FlashLoader/0x430.stldr
deleted file mode 100644
index 7ce7a5fe9..000000000
Binary files a/win/stlink/FlashLoader/0x430.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x431.stldr b/win/stlink/FlashLoader/0x431.stldr
deleted file mode 100644
index cc0afb1b2..000000000
Binary files a/win/stlink/FlashLoader/0x431.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x432.stldr b/win/stlink/FlashLoader/0x432.stldr
deleted file mode 100644
index 8b93983e7..000000000
Binary files a/win/stlink/FlashLoader/0x432.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x433.stldr b/win/stlink/FlashLoader/0x433.stldr
deleted file mode 100644
index 02f50d2bb..000000000
Binary files a/win/stlink/FlashLoader/0x433.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x434.stldr b/win/stlink/FlashLoader/0x434.stldr
deleted file mode 100644
index 4db0da711..000000000
Binary files a/win/stlink/FlashLoader/0x434.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x434_DB1M_On.stldr b/win/stlink/FlashLoader/0x434_DB1M_On.stldr
deleted file mode 100644
index 5dafc1316..000000000
Binary files a/win/stlink/FlashLoader/0x434_DB1M_On.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x435.stldr b/win/stlink/FlashLoader/0x435.stldr
deleted file mode 100644
index c865f57a8..000000000
Binary files a/win/stlink/FlashLoader/0x435.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x436.stldr b/win/stlink/FlashLoader/0x436.stldr
deleted file mode 100644
index e9c88deaa..000000000
Binary files a/win/stlink/FlashLoader/0x436.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x437.stldr b/win/stlink/FlashLoader/0x437.stldr
deleted file mode 100644
index 1892bedd1..000000000
Binary files a/win/stlink/FlashLoader/0x437.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x438.stldr b/win/stlink/FlashLoader/0x438.stldr
deleted file mode 100644
index ea7ed37ef..000000000
Binary files a/win/stlink/FlashLoader/0x438.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x439.stldr b/win/stlink/FlashLoader/0x439.stldr
deleted file mode 100644
index 61372ae5b..000000000
Binary files a/win/stlink/FlashLoader/0x439.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x440.stldr b/win/stlink/FlashLoader/0x440.stldr
deleted file mode 100644
index b1fa618c4..000000000
Binary files a/win/stlink/FlashLoader/0x440.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x441.stldr b/win/stlink/FlashLoader/0x441.stldr
deleted file mode 100644
index 8895a1775..000000000
Binary files a/win/stlink/FlashLoader/0x441.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x442.stldr b/win/stlink/FlashLoader/0x442.stldr
deleted file mode 100644
index 8deb980d0..000000000
Binary files a/win/stlink/FlashLoader/0x442.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x444.stldr b/win/stlink/FlashLoader/0x444.stldr
deleted file mode 100644
index 276176e02..000000000
Binary files a/win/stlink/FlashLoader/0x444.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x445.stldr b/win/stlink/FlashLoader/0x445.stldr
deleted file mode 100644
index 62cfb84b2..000000000
Binary files a/win/stlink/FlashLoader/0x445.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x446.stldr b/win/stlink/FlashLoader/0x446.stldr
deleted file mode 100644
index 72185da42..000000000
Binary files a/win/stlink/FlashLoader/0x446.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x447.stldr b/win/stlink/FlashLoader/0x447.stldr
deleted file mode 100644
index 972174e1a..000000000
Binary files a/win/stlink/FlashLoader/0x447.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x448.stldr b/win/stlink/FlashLoader/0x448.stldr
deleted file mode 100644
index 15728bd42..000000000
Binary files a/win/stlink/FlashLoader/0x448.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x449.stldr b/win/stlink/FlashLoader/0x449.stldr
deleted file mode 100644
index 1810dabad..000000000
Binary files a/win/stlink/FlashLoader/0x449.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x450.stldr b/win/stlink/FlashLoader/0x450.stldr
deleted file mode 100644
index 147da0ac8..000000000
Binary files a/win/stlink/FlashLoader/0x450.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x451.stldr b/win/stlink/FlashLoader/0x451.stldr
deleted file mode 100644
index 89691f5dc..000000000
Binary files a/win/stlink/FlashLoader/0x451.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x451_DB_On.stldr b/win/stlink/FlashLoader/0x451_DB_On.stldr
deleted file mode 100644
index f39502236..000000000
Binary files a/win/stlink/FlashLoader/0x451_DB_On.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x452.stldr b/win/stlink/FlashLoader/0x452.stldr
deleted file mode 100644
index 5d46da249..000000000
Binary files a/win/stlink/FlashLoader/0x452.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x457.stldr b/win/stlink/FlashLoader/0x457.stldr
deleted file mode 100644
index 879ab385d..000000000
Binary files a/win/stlink/FlashLoader/0x457.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x458.stldr b/win/stlink/FlashLoader/0x458.stldr
deleted file mode 100644
index 63a3fb974..000000000
Binary files a/win/stlink/FlashLoader/0x458.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x460.stldr b/win/stlink/FlashLoader/0x460.stldr
deleted file mode 100644
index 6610e2264..000000000
Binary files a/win/stlink/FlashLoader/0x460.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x461.stldr b/win/stlink/FlashLoader/0x461.stldr
deleted file mode 100644
index 50baccd92..000000000
Binary files a/win/stlink/FlashLoader/0x461.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x462.stldr b/win/stlink/FlashLoader/0x462.stldr
deleted file mode 100644
index eaf222753..000000000
Binary files a/win/stlink/FlashLoader/0x462.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x463.stldr b/win/stlink/FlashLoader/0x463.stldr
deleted file mode 100644
index 2f57b6353..000000000
Binary files a/win/stlink/FlashLoader/0x463.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x470.stldr b/win/stlink/FlashLoader/0x470.stldr
deleted file mode 100644
index c909b1142..000000000
Binary files a/win/stlink/FlashLoader/0x470.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x495.stldr b/win/stlink/FlashLoader/0x495.stldr
deleted file mode 100644
index 96f4fd0e4..000000000
Binary files a/win/stlink/FlashLoader/0x495.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x9A8.stldr b/win/stlink/FlashLoader/0x9A8.stldr
deleted file mode 100644
index 099d79300..000000000
Binary files a/win/stlink/FlashLoader/0x9A8.stldr and /dev/null differ
diff --git a/win/stlink/FlashLoader/0x9B0.stldr b/win/stlink/FlashLoader/0x9B0.stldr
deleted file mode 100644
index a2ee9d850..000000000
Binary files a/win/stlink/FlashLoader/0x9B0.stldr and /dev/null differ
diff --git a/win/stlink/ST-LINK_CLI.exe b/win/stlink/ST-LINK_CLI.exe
deleted file mode 100644
index c9121c794..000000000
Binary files a/win/stlink/ST-LINK_CLI.exe and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll
deleted file mode 100644
index 1731b962d..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/WdfCoInstaller01009.dll and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll
deleted file mode 100644
index 30e55025b..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/amd64/winusbcoinstaller2.dll and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe b/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe
deleted file mode 100644
index 1a09e6711..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_amd64.exe and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe b/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe
deleted file mode 100644
index abe47e77e..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/dpinst_x86.exe and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf
deleted file mode 100644
index 8805bd73e..000000000
--- a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_VCP.inf
+++ /dev/null
@@ -1,74 +0,0 @@
-
-;
-; Installs the Virtual COM port interface of ST-Link based composite devices.
-;
-
-[Version]
-Signature = "$Windows NT$"
-Class     = Ports
-ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider  = %ManufacturerName%
-CatalogFile.NTx86  = STLinkVCP_x86.cat
-CatalogFile.NTAMD64 = STLinkVCP_x64.cat
-DriverVer=12/10/2013,1.0
-
-; ========== Manufacturer/Models sections ===========
-
-[Manufacturer]
-%ManufacturerName% = Standard,NTx86,NTamd64
-
-; List of devices supporting the Virtual COM port (with the corresponding interface ID)
-[Standard.NTx86]
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
-
-[Standard.NTamd64]
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374A&MI_02
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374B&MI_02
-%DeviceNameVCP% =USB_InstallVCP, USB\VID_0483&PID_374C&MI_01
-
-; ========== Class definition ===========
-
-[ClassInstall32]
-AddReg = ClassInstall_AddReg
-
-[ClassInstall_AddReg]
-HKR,,,,%ClassName%
-HKR,,NoInstallClass,,1
-HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
-HKR,,LowerLogoVersion,,5.2
-
-; =================== Installation ===================
-
-[USB_InstallVCP]
-Include   = mdmcpq.inf
-CopyFiles = FakeModemCopyFileSection
-AddReg    = USB_InstallVCP.AddReg
-
-[USB_InstallVCP.AddReg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,usbser.sys
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
-
-[USB_InstallVCP.Services]
-AddService=usbser, 0x00000002, DriverService
-
-[DriverService]
-DisplayName=%DeviceNameVCP%
-ServiceType=1
-StartType=3
-ErrorControl=1
-ServiceBinary=%12%\usbser.sys
-
-; [DestinationDirs]
-; If your INF needs to copy files, you must not use the DefaultDestDir directive here.  
-; You must explicitly reference all file-list-section names in this section.
-
-; =================== Strings ===================
-
-[Strings]
-ManufacturerName="STMicroelectronics"
-ClassName="Universal Serial Bus devices"
-DeviceNameVCP="STMicroelectronics STLink Virtual COM Port"
-REG_MULTI_SZ = 0x00010000
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf
deleted file mode 100644
index deb8434f0..000000000
--- a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_dbg_winusb.inf
+++ /dev/null
@@ -1,135 +0,0 @@
-;
-; Installation INF for the STMicroelectronics STLINK for Windows XP SP2 or later.
-;
-
-[Version]
-Signature = "$Windows NT$"
-Class     = STLinkWinUSB
-ClassGUID = {88BAE032-5A81-49f0-BC3D-A4FF138216D6}
-Provider  = %ManufacturerName%
-CatalogFile.NTx86  = STLinkDbgWinUSB_x86.cat
-CatalogFile.NTAMD64 = STLinkDbgWinUSB_x64.cat
-DriverVer=01/21/2013,1.01
-
-; ========== Manufacturer/Models sections ===========
-
-[Manufacturer]
-%ManufacturerName% = Standard,NTx86,NTamd64
-
-[Standard.NTx86]
-%DeviceName% =USB_Install, USB\VID_0483&PID_3748
-%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
-%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
-%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
-
-[Standard.NTamd64]
-%DeviceName% =USB_Install, USB\VID_0483&PID_3748
-%DeviceName% =USB_Install, USB\VID_0483&PID_374A&MI_00
-%DeviceName% =USB_Install, USB\VID_0483&PID_374B&MI_00
-%DeviceNameRW% =USB_InstallRW, USB\VID_0483&PID_374A&MI_01
-
-; ========== Class definition ===========
-
-[ClassInstall32]
-AddReg = ClassInstall_AddReg
-
-[ClassInstall_AddReg]
-HKR,,,,%ClassName%
-HKR,,NoInstallClass,,1
-HKR,,IconPath,%REG_MULTI_SZ%,"%systemroot%\system32\setupapi.dll,-20"
-HKR,,LowerLogoVersion,,5.2
-
-; =================== Installation ===================
-
-[USB_Install]
-Include = winusb.inf
-Needs   = WINUSB.NT
-
-[USB_InstallRW]
-Include = winusb.inf
-Needs   = WINUSB.NT
-
-[USB_Install.Services]
-Include =winusb.inf
-Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
-
-[USB_InstallRW.Services]
-Include =winusb.inf
-Addservice = WinUSB, 0x00000002, WinUSB_ServiceInstall
-
-[WinUSB_ServiceInstall]
-DisplayName    = %WinUSB_SvcDesc%
-ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
-StartType      = 3                  ; SERVICE_DEMAND_START
-ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\WinUSB.sys
-
-[USB_Install.Wdf]
-KmdfService=WINUSB, WinUsb_Install
-
-[USB_InstallRW.Wdf]
-KmdfService=WINUSB, WinUsb_Install
-
-[WinUsb_Install]
-KmdfLibraryVersion=1.9
-
-[USB_Install.HW]
-AddReg=Dev_AddReg
-
-[USB_InstallRW.HW]
-AddReg=Dev_AddRegRW
-
-[Dev_AddReg]
-HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID%
-
-[Dev_AddRegRW]
-HKR,,DeviceInterfaceGUIDs,0x10000,%STLink_GUID_RW%
-
-[USB_Install.CoInstallers]
-AddReg=CoInstallers_AddReg
-CopyFiles=CoInstallers_CopyFiles
-
-[USB_InstallRW.CoInstallers]
-AddReg=CoInstallers_AddReg
-CopyFiles=CoInstallers_CopyFiles
-
-[CoInstallers_CopyFiles]
-WinUSBCoInstaller2.dll
-WdfCoInstaller01009.dll
-
-[CoInstallers_AddReg]
-HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
-
-[DestinationDirs]
-; If your INF needs to copy files, you must not use the DefaultDestDir directive here.  
-; You must explicitly reference all file-list-section names in this section.
-CoInstallers_CopyFiles=11
-
-; ================= Source Media Section =====================
-
-[SourceDisksNames]
-1 = %DISK_NAME%,,,\x86
-2 = %DISK_NAME%,,,\amd64
-
-[SourceDisksFiles.x86]
-WinUSBCoInstaller2.dll=1
-WdfCoInstaller01009.dll=1
-
-[SourceDisksFiles.amd64]
-WinUSBCoInstaller2.dll=2
-WdfCoInstaller01009.dll=2
-
-; =================== Strings ===================
-
-[Strings]
-ManufacturerName="STMicroelectronics"
-ClassName="Universal Serial Bus devices"
-DeviceName="STMicroelectronics STLink dongle"
-DeviceNameRW="STMicroelectronics STLink dongle RW"
-WinUSB_SvcDesc="WinUSB Driver for STLink"
-REG_MULTI_SZ = 0x00010000
-DISK_NAME="WinUSB coinstallers sources on disk"
-
-;------------Replace GUID below with custom GUID-------------;
-STLink_GUID="{DBCE1CD9-A320-4b51-A365-A0C3F3C5FB29}"
-STLink_GUID_RW="{8326506F-7260-4854-9C03-26E416F04494}"
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat
deleted file mode 100644
index dccbe947e..000000000
--- a/win/stlink/ST-LINK_USB_V2_1_Driver/stlink_winusb_install.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-if "%PROCESSOR_ARCHITEW6432%" == "AMD64" goto X64
-if "%PROCESSOR_ARCHITECTURE%" == "AMD64" goto X64
-start "" dpinst_x86.exe 
-goto END
-:X64
-start "" dpinst_amd64.exe
-:END
\ No newline at end of file
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat
deleted file mode 100644
index b4e906491..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x64.cat and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat
deleted file mode 100644
index 3d7e801eb..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkdbgwinusb_x86.cat and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat
deleted file mode 100644
index e7252bd85..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x64.cat and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat b/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat
deleted file mode 100644
index c76a573da..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/stlinkvcp_x86.cat and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll
deleted file mode 100644
index 30e81af62..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/WdfCoInstaller01009.dll and /dev/null differ
diff --git a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll b/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll
deleted file mode 100644
index fc450d2b2..000000000
Binary files a/win/stlink/ST-LINK_USB_V2_1_Driver/x86/winusbcoinstaller2.dll and /dev/null differ
diff --git a/win/stlink/STLinkUSBDriver.dll b/win/stlink/STLinkUSBDriver.dll
deleted file mode 100644
index e25fc7e8b..000000000
Binary files a/win/stlink/STLinkUSBDriver.dll and /dev/null differ
diff --git a/win/stlink/advapi32.dll b/win/stlink/advapi32.dll
deleted file mode 100644
index 651d1c834..000000000
Binary files a/win/stlink/advapi32.dll and /dev/null differ
diff --git a/win/stlink/comctl32.dll b/win/stlink/comctl32.dll
deleted file mode 100644
index 9958c8918..000000000
Binary files a/win/stlink/comctl32.dll and /dev/null differ
diff --git a/win/stlink/readme.md b/win/stlink/readme.md
deleted file mode 100644
index 5ec3fcbcc..000000000
--- a/win/stlink/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-STLink software is copyright STMicroelectronics 
-
-See docs/license.txt - also shown below...
-
-
-
-SOFTWARE LICENSE AGREEMENT
-
-
-By using this Licensed Software, You are agreeing to be bound by the terms and conditions of this License Agreement. Do not use the Licensed Software until You have read and agreed to the following terms and conditions. The use of the Licensed Software implies automatically the acceptance of the following terms and conditions. Please indicate your acceptance or NON-acceptance by selecting 'I ACCEPT' or 'I DO NOT ACCEPT' as indicated below in the media.
-
-DEFINITIONS.
-
-Licensed Software: means the enclosed SOFTWARE LIBRARY, EXAMPLES, PROJECT TEMPLATE and all the related documentation and design tools licensed in the form of object and/or source code as the case maybe.
-
-Product: means a product or a system that includes or incorporates solely and exclusively an executable version of the Licensed Software and provided further that such Licensed Software executes solely and exclusively on STM32 microcontrollers devices manufactured by or for ST.
-
-LICENSE.
-STMicroelectronics (ST) grants You a non-exclusive, worldwide, non-transferable (whether by assignment or otherwise) non sub-licensable, revocable, royalty-free limited license of the Licensed Software to: 
-(i) make copies, prepare derivatives works, of the source code version of the Licensed Software for the sole and exclusive purpose of developing executable versions (in object and source code) of such Licensed Software only for use with the Product;
-(ii) make copies, prepare derivatives works of the object code versions of the Licensed Software for the sole purpose of designing, developing and manufacturing the Products;
-(iii) make, use, sell, offer to sell, lease, hire out, import and export or otherwise distribute Products.
-
-
-OWNERSHIP AND COPYRIGHT. Title to the Licensed Software, related documentation and all copies thereof remain with ST and/or its licensors. You may not remove the copyrights notices from the Licensed Software and to any copies of the Licensed Software. You agree to prevent any unauthorized copying of the Licensed Software and related documentation.
-
-
-RESTRICTIONS. Unless otherwise explicitly stated in this Agreement, You may not sell, assign, sublicense, lease, rent or otherwise distribute the Licensed Software for commercial purposes, in whole or in part.
-
-You acknowledge and agree that any use, adaptation translation or transcription of the Licensed Software or any portion or derivative thereof, for use with processors manufactured by or for an entity other than ST is a material breach of this Agreement and requires a separate license from ST. 
-
-No source code and/or object code relating to and/or based upon Licensed Software is to be made available by You unless expressly permitted under the section 'License'.
-
-You acknowledge and agree that the protection of the source code of the Licensed Software warrants the imposition of reasonable security precautions 
-In the event ST demonstrates to You a reasonable belief that the source code of the Licensed Software has been used or distributed in violation of this Agreement, ST may by written notification request certification as to whether such unauthorized use or distribution has occurred. You shall cooperate and assist ST in its determination of whether there has been unauthorized use or distribution of the source code of the Licensed Software and will take appropriate steps to remedy any unauthorized use or distribution.
-
-NO WARRANTY. The Licensed Software is provided 'as is' and 'with all faults' without warranty of any kind expressed or implied. ST and its licensors expressly disclaim all warranties, expressed, implied or otherwise, including without limitation, warranties of merchantability, fitness for a particular purpose and non-infringement of intellectual property rights. ST does not warrant that the use in whole or in part of the Licensed Software will be interrupted or error free, will meet your requirements, or will operate with the combination of hardware and software selected by You.
-
-You are responsible for determining whether the Licensed Software will be suitable for your intended use or application or will achieve your intended results. 
-
-ST has not authorized anyone to make any representation or warranty for the Licensed Software, and any technical, applications or design information or advice, quality characterization, reliability data or other services provided by ST shall not constitute any representation or warranty by ST or alter this disclaimer or warranty, and in no additional obligations or liabilities shall arise from ST’s providing such information or services. ST does not assume or authorize any other person to assume for it any other liability in connection with its Licensed Software.
-
-Nothing contained in this Agreement will be construed as 
-(i)	a warranty or representation by ST to maintain production of any ST device or other hardware or software with which the Licensed Software may be used or to otherwise maintain or support the Licensed Software in any manner; and
-(ii)    a commitment from ST and/or its licensors to bring or prosecute actions or suits against third parties for infringement of any of the rights licensed hereby, or conferring any rights to bring or prosecute actions or suits against third parties for infringement. However, ST has the right to terminate this Agreement immediately upon receiving notice of any claim, suit or proceeding that alleges that the Licensed Software or your use or distribution of the Licensed Software infringes any third party intellectual property rights.
- 
-All other warranties, conditions or other terms implied by law are excluded to the fullest extent permitted by law.
-
-LIMITATION OF LIABILITIES. In no event ST or its licensors shall be liable to You or any third party for any indirect, special, consequential, incidental, punitive damages or other damages (including but not limited to, the cost of labour, re-qualification, delay, loss of profits, loss of revenues, loss of data, costs of procurement of substitute goods or services or the like) whether based on contract, tort, or any other legal theory, relating to or in connection with the Licensed Software, the documentation or this Agreement, even if ST has been advised of the possibility of such damages.
-
-In no event shall ST’s liability to You or any third party under this Agreement, including any claim with respect of any third party intellectual property rights, for any cause of action exceed 100 US$. This section does not apply to the extent prohibited by law. For the purposes of this section, any liability of ST shall be treated in the aggregate.
-
-TERMINATION. ST may terminate this License Agreement license at any time if You are in material breach of any of its terms and conditions. Upon termination, You will immediately destroy or return all copies of the Licensed Software and documentation to ST.
-
-
-APPLICABLE LAW AND JURISDICTION. In case of dispute and in the absence of an amicable settlement, the only competent jurisdiction shall be the Courts of Geneva, Switzerland. The applicable law shall be the law of Switzerland. 
-
-
-SEVERABILITY. If any provision of this agreement is or becomes, at any time or for any reason, unenforceable or invalid, no other provision of this agreement shall be affected thereby, and the remaining provisions of this agreement shall continue with the same force and effect as if such unenforceable or invalid provisions had not been inserted in this Agreement.
-
-
-WAIVER. The waiver by either party of any breach of any provisions of this Agreement shall not operate or be construed as a waiver of any other or a subsequent breach of the same or a different provision.
-
-RELATIONSHIP OF THE PARTIES. Nothing in this Agreement shall create, or be deemed to create, a partnership or the relationship of principal and agent or employer and employee between the Parties. Neither Party has the authority or power to bind, to contract in the name of or to create a liability for the other in any way or for any purpose.
-
-
diff --git a/win/stlink_upload.bat b/win/stlink_upload.bat
deleted file mode 100644
index 3ef99c842..000000000
--- a/win/stlink_upload.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-rem: Note %~dp0 get path of this batch file
-rem: Need to change drive if My Documents is on a drive other than C:
-set driverLetter=%~dp0
-set driverLetter=%driverLetter:~0,2%
-%driverLetter%
-cd %~dp0
-rem: the two line below are needed to fix path issues with incorrect slashes before the bin file name
-set str=%4
-set str=%str:/=\%
-
-
-rem: ------------- use STLINK CLI
-rem: echo "" is mandatory to exit ST-Link_CLI tools w 3.0.0.0 when "-Run" option is used,
-rem: it now wait Enter key press to quit.
-echo "" | stlink\ST-LINK_CLI.exe -c SWD -P %str% 0x8000000 -Rst -Run
diff --git a/win/stm32CubeProg.bat b/win/stm32CubeProg.bat
new file mode 100644
index 000000000..f1d259b1c
--- /dev/null
+++ b/win/stm32CubeProg.bat
@@ -0,0 +1,79 @@
+@echo off
+
+set ERROR=0
+set STM32CP_CLI=STM32_Programmer_CLI.exe
+set ADDRESS=0x8000000
+
+:: Check tool
+where /Q %STM32CP_CLI%
+if %errorlevel%==0 goto :param
+::Check with default path
+set STM32CP=%ProgramW6432%\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin
+set STM32CP86=%ProgramFiles(X86)%\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin
+set PATH=%PATH%;%STM32CP%;%STM32CP86%
+where /Q %STM32CP_CLI%
+if %errorlevel%==0 goto :param
+echo %STM32CP_CLI% not found.
+echo Please install it or add ^<STM32CubeProgrammer path^>\bin' to your PATH environment:
+echo https://www.st.com/en/development-tools/stm32cubeprog.html
+echo Aborting!
+exit 1
+
+:param
+:: Parse options
+if "%~1"=="" echo Not enough arguments! & set ERROR=2 & goto :usage
+if "%~2"=="" echo Not enough arguments! & set ERROR=2 & goto :usage
+set FILEPATH=%~2
+
+:: Protocol
+:: 0: SWD
+:: 1: Serial
+:: 2: DFU
+if %~1==0 goto :SWD
+if %~1==1 goto :SERIAL
+if %~1==2 goto :DFU
+echo Protocol unknown!
+set ERROR=4
+goto :usage
+
+:SWD
+set PORT=SWD
+set MODE=mode=UR
+if "%~3"=="" (set OPTS=-rst) else (set OPTS=%3)
+goto :prog
+
+:SERIAL
+if "%~3"=="" set ERROR=3 & goto :usage
+set PORT=%~3
+
+if "%~4"=="" goto :prog
+shift
+shift
+shift
+set OPTS=%*
+goto :prog
+
+:DFU
+set PORT=USB1
+goto :prog
+
+:prog
+%STM32CP_CLI% -c port=%PORT% %MODE% -q -d %FILEPATH% %ADDRESS% %OPTS%
+exit 0
+
+:usage
+  echo %0 ^<protocol^> ^<file_path^> [OPTIONS]
+  echo.
+  echo protocol:
+  echo   0: SWD
+  echo   1: Serial
+  echo   2: DFU
+  echo file_path: file path name to be downloaded: (bin, hex)
+  echo Options:
+  echo   For SWD: -rst
+  echo     -rst: Reset system (default)
+  echo   For Serial: ^<com_port^> -s
+  echo     com_port: serial identifier. Ex: /dev/ttyS0
+  echo     -s: start automatically
+  echo   For DFU: none
+  exit %ERROR%
diff --git a/win/stm32flash/stm32flash.exe b/win/stm32flash/stm32flash.exe
deleted file mode 100644
index 13c90779d..000000000
Binary files a/win/stm32flash/stm32flash.exe and /dev/null differ
diff --git a/win/stm32flash/stm32flash64.exe b/win/stm32flash/stm32flash64.exe
deleted file mode 100644
index 63c527247..000000000
Binary files a/win/stm32flash/stm32flash64.exe and /dev/null differ