Fix flash scripts on Raspberry Pi

lupyuen · Jan 20, 2020 · 059b0ef · 059b0ef
1 parent ea92c60
commit 059b0ef
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 17 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -135,7 +135,7 @@
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " scripts/nrf52-pi/flash-boot.sh && echo ✅ ◾ ️Done! "
+                    " scripts/nrf52/flash-boot.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],
@@ -167,7 +167,7 @@
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " scripts/nrf52-pi/flash-app.sh && echo ✅ ◾ ️Done! "
+                    " scripts/nrf52/flash-app.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],
@@ -197,7 +197,7 @@
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " scripts/nrf52-pi/flash-erase.sh && echo ✅ ◾ ️Done! "
+                    " scripts/nrf52/flash-erase.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],

diff --git a/scripts/config.sh b/scripts/config.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+#  Configuration for build, run and flash scripts
+
+#  For Raspberry Pi:
+#  source scripts/nrf52-pi/config.sh
+
+#  Select ST-Link v2 as SWD Programmer
+swd_device=scripts/nrf52/swd-stlink.ocd
+
+#  Select Raspberry Pi as SWD Programmer
+#  swd_device=scripts/nrf52-pi/swd-pi.ocd
diff --git a/scripts/install-pi.sh b/scripts/install-pi.sh
@@ -14,6 +14,9 @@ set -x  #  Echo all commands.
 #  cd ~/pinetime-rust-mynewt
 #  scripts/install-pi.sh
 
+#  Configure scripts for Raspberry Pi
+echo "source scripts/nrf52-pi/config.sh" >scripts/config.sh
+
 set +x; echo; echo "----- Setting versions..."; set -x
 source scripts/install-version.sh
 

diff --git a/scripts/nrf52-pi/config.sh b/scripts/nrf52-pi/config.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#  Configuration for build, run and flash scripts on Raspberry Pi
+
+#  Select Raspberry Pi as SWD Programmer
+swd_device=scripts/nrf52-pi/swd-pi.ocd
diff --git a/scripts/nrf52-pi/flash-erase.sh b/scripts/nrf52-pi/flash-erase.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#  #  Erase Flash ROM on nRF52 with Raspberry Pi
+
+set -e  #  Exit when any command fails.
+set -x  #  Echo all commands.
+
+#  Configure SWD Programmer
+source scripts/config.sh
+
+#  Erase the Flash ROM
+openocd/bin/openocd \
+    -f $swd_device \
+    -f scripts/nrf52/flash-erase.ocd
diff --git a/scripts/nrf52/flash-app.ocd b/scripts/nrf52/flash-app.ocd
@@ -1,4 +1,4 @@
-# This is an OpenOCD script that connects ST-Link to the nRF52 and flashes the Application ROM.
+# This is an OpenOCD script that connects ST-Link or Raspberry Pi to the nRF52 and flashes the Application ROM.
 # Used by tasks.json for "Load Application" command.
 # Equivalent to "newt load -v nrf52_my_sensor".
 

diff --git a/scripts/nrf52/flash-app.sh b/scripts/nrf52/flash-app.sh
@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
-#  Flash Mynewt Application to nRF52 with ST-Link on macOS and Linux
+#  Flash Mynewt Application to nRF52 on macOS, Linux and Raspberry Pi
 
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
 
+#  Configure SWD Programmer
+source scripts/config.sh
+
+#  Flash the device
 openocd/bin/openocd \
-    -f scripts/nrf52/swd-stlink.ocd \
+    -f $swd_device \
     -f scripts/nrf52/flash-app.ocd
diff --git a/scripts/nrf52/flash-boot.ocd b/scripts/nrf52/flash-boot.ocd
@@ -1,4 +1,4 @@
-# This is an OpenOCD script that connects ST-Link to the nRF52 and flashes the Bootloader ROM.
+# This is an OpenOCD script that connects ST-Link or Raspberry Pi to the nRF52 and flashes the Bootloader ROM.
 # Used by tasks.json for "Load Bootloader" command.
 # Equivalent to "newt load -v nrf52_boot".
 

diff --git a/scripts/nrf52/flash-boot.sh b/scripts/nrf52/flash-boot.sh
@@ -1,17 +1,13 @@
 #!/usr/bin/env bash
-#  Flash Mynewt Bootloader to nRF52 with ST-Link on macOS and Linux
+#  Flash Mynewt Bootloader to nRF52 on macOS, Linux and Raspberry Pi
 
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
 
-#  Identify SWD programmer. /proc/device-tree/model contains
-#  Raspberry Pi 4 Model B Rev 1.1
-#  Raspberry Pi 3 Model B Plus Rev 1.3
-swd_device=stlink
-if [ -e /proc/device-tree/model ]; then
-    swd_device=pi
-fi
+#  Configure SWD Programmer
+source scripts/config.sh
 
+#  Flash the device
 openocd/bin/openocd \
-    -f scripts/nrf52/swd-$swd_device.ocd \
+    -f $swd_device \
     -f scripts/nrf52/flash-boot.ocd
diff --git a/scripts/nrf52/flash-erase.ocd b/scripts/nrf52/flash-erase.ocd
@@ -1,4 +1,4 @@
-# This is an OpenOCD script that connects ST-Link to the nRF52 and erases the flash ROM.
+# This is an OpenOCD script that connects ST-Link or Raspberry Pi to the nRF52 and erases the flash ROM.
 # Used by tasks.json for "Erase Flash" command.
 
 # From https://devzone.nordicsemi.com/f/nordic-q-a/42824/flashing-nrf5832-using-only-st-link-v2-and-openocd