Move OpenOCD stuff into contrib/.

This has gone unmaintained for long enough.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

6 files changed, 0 insertions, 351 deletions

diff --git a/support/make/build-rules.mk b/support/make/build-rules.mk
index 330cdd8..3d541ba 100644
--- a/support/make/build-rules.mk
+++ b/support/make/build-rules.mk
@@ -9,7 +9,6 @@ DISAS    := arm-none-eabi-objdump
 OBJDUMP  := arm-none-eabi-objdump
 SIZE     := arm-none-eabi-size
 DFU      := dfu-util
-OPENOCD_WRAPPER  := support/scripts/openocd-wrapper.sh
 
 # Suppress annoying output unless V is set
 ifndef V
diff --git a/support/openocd/debug_0.3.cfg b/support/openocd/debug_0.3.cfg
deleted file mode 100644
index 87d33ae..0000000
--- a/support/openocd/debug_0.3.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-# script for stm32
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0003
-
-if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
-} else {
-   set  _CHIPNAME stm32
-}
-
-if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
-} else {
-   set  _ENDIAN little
-}
-
-# jtag speed speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so ufse F_JTAG = 1MHz
-jtag_khz 1000
-
-jtag_nsrst_delay 100
-jtag_ntrst_delay 100
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
-
-#jtag scan chain
-if { [info exists CPUTAPID ] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-  # See STM Document RM0008
-  # Section 30.6.3
-   set _CPUTAPID 0x3ba00477
-}
-
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-if { [info exists BSTAPID ] } {
-   # FIXME this never gets used to override defaults...
-   set _BSTAPID $BSTAPID
-} else {
-  # See STM Document RM0008
-  # Section 29.6.2
-  # Low density devices, Rev A
-  set _BSTAPID1 0x06412041
-  # Medium density devices, Rev A
-  set _BSTAPID2 0x06410041
-  # Medium density devices, Rev B and Rev Z
-  set _BSTAPID3 0x16410041
-  # High density devices, Rev A
-  set _BSTAPID4 0x06414041
-  # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
-}
-jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-           -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
-           -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
-
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
-
-flash bank stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
-
-proc nopforever {} {
-    puts "Resetting the chip..."
-    reset run
-}
-
-init
-nopforever
diff --git a/support/openocd/debug_0.4.cfg b/support/openocd/debug_0.4.cfg
deleted file mode 100644
index 7d6982a..0000000
--- a/support/openocd/debug_0.4.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-# script for stm32
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0003
-
-if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
-} else {
-   set  _CHIPNAME stm32
-}
-
-if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
-} else {
-   set  _ENDIAN little
-}
-
-# jtag speed speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so ufse F_JTAG = 1MHz
-jtag_khz 1000
-
-jtag_nsrst_delay 100
-jtag_ntrst_delay 100
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config srst_only
-
-#jtag scan chain
-if { [info exists CPUTAPID ] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-  # See STM Document RM0008
-  # Section 30.6.3
-   set _CPUTAPID 0x3ba00477
-}
-
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-if { [info exists BSTAPID ] } {
-   # FIXME this never gets used to override defaults...
-   set _BSTAPID $BSTAPID
-} else {
-  # See STM Document RM0008
-  # Section 29.6.2
-  # Low density devices, Rev A
-  set _BSTAPID1 0x06412041
-  # Medium density devices, Rev A
-  set _BSTAPID2 0x06410041
-  # Medium density devices, Rev B and Rev Z
-  set _BSTAPID3 0x16410041
-  # High density devices, Rev A
-  set _BSTAPID4 0x06414041
-  # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
-}
-jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-           -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
-           -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
-
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
-
-flash bank bank0 stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
-
-proc nopforever {} {
-    puts "Resetting the chip... Halting for debugger."
-    reset halt
-}
-
-init
-nopforever
diff --git a/support/openocd/flash_0.3.cfg b/support/openocd/flash_0.3.cfg
deleted file mode 100644
index 41c6532..0000000
--- a/support/openocd/flash_0.3.cfg
+++ /dev/null
@@ -1,89 +0,0 @@
-# script for stm32
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0003
-
-if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
-} else {
-   set  _CHIPNAME stm32
-}
-
-if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
-} else {
-   set  _ENDIAN little
-}
-
-# jtag speed speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so ufse F_JTAG = 1MHz
-jtag_khz 1000
-
-jtag_nsrst_delay 100
-jtag_ntrst_delay 100
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
-
-#jtag scan chain
-if { [info exists CPUTAPID ] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-  # See STM Document RM0008
-  # Section 30.6.3
-   set _CPUTAPID 0x3ba00477
-}
-
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-if { [info exists BSTAPID ] } {
-   # FIXME this never gets used to override defaults...
-   set _BSTAPID $BSTAPID
-} else {
-  # See STM Document RM0008
-  # Section 29.6.2
-  # Low density devices, Rev A
-  set _BSTAPID1 0x06412041
-  # Medium density devices, Rev A
-  set _BSTAPID2 0x06410041
-  # Medium density devices, Rev B and Rev Z
-  set _BSTAPID3 0x16410041
-  # High density devices, Rev A
-  set _BSTAPID4 0x06414041
-  # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
-}
-jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-           -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
-           -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
-
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
-# TODO: native
-#$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x10000 -work-area-backup 0
-
-flash bank stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
-
-proc flash_chip {} {
-    echo "Halting..."
-    halt
-    echo "Erasing..."
-    flash erase_address 0x08000000 0x20000
-    # TODO: native
-    #flash erase_address 0x08000000 0x80000
-    echo "Flashing image..."
-    flash write_bank 0 build/maple.bin 0
-    echo "Verifying image..."
-    verify_image build/maple.bin 0x08000000 bin
-    echo "Checksum verified, resetting chip"
-    reset run
-    echo "Daemon shutdown"
-    shutdown
-}
-
-init
-flash_chip
diff --git a/support/openocd/flash_0.4.cfg b/support/openocd/flash_0.4.cfg
deleted file mode 100644
index 32c06c6..0000000
--- a/support/openocd/flash_0.4.cfg
+++ /dev/null
@@ -1,95 +0,0 @@
-# script for stm32
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0003
-
-if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
-} else {
-   set  _CHIPNAME stm32
-}
-
-if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
-} else {
-   set  _ENDIAN little
-}
-
-# jtag speed speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so ufse F_JTAG = 1MHz
-jtag_khz 1000
-
-jtag_nsrst_delay 100
-jtag_ntrst_delay 100
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config srst_only
-
-#jtag scan chain
-if { [info exists CPUTAPID ] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-  # See STM Document RM0008
-  # Section 30.6.3
-   set _CPUTAPID 0x3ba00477
-}
-
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-if { [info exists BSTAPID ] } {
-   # FIXME this never gets used to override defaults...
-   set _BSTAPID $BSTAPID
-} else {
-  # See STM Document RM0008
-  # Section 29.6.2
-  # Low density devices, Rev A
-  set _BSTAPID1 0x06412041
-  # Medium density devices, Rev A
-  set _BSTAPID2 0x06410041
-  # Medium density devices, Rev B and Rev Z
-  set _BSTAPID3 0x16410041
-  # High density devices, Rev A
-  set _BSTAPID4 0x06414041
-  # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
-}
-jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
-           -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
-           -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
-
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
-
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
-# TODO: native
-#$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x10000 -work-area-backup 0
-
-flash bank bank0 stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
-
-proc flash_chip {} {
-    echo "Halting..."
-    reset halt
-
-    echo "Unlocking flash..."
-    flash protect 0 0 last off
-
-    echo "Erasing..."
-    flash erase_address 0x08000000 0x20000
-
-    echo "Flashing image..."
-    flash write_bank 0 build/maple.bin 0
-
-    echo "Verifying image..."
-    verify_image build/maple.bin 0x08000000 bin
-
-    echo "Checksum verified, resetting chip"
-    reset run
-
-    echo "Daemon shutdown"
-    shutdown
-}
-
-init
-flash_chip
diff --git a/support/scripts/openocd-wrapper.sh b/support/scripts/openocd-wrapper.sh
deleted file mode 100755
index 73be92e..0000000
--- a/support/scripts/openocd-wrapper.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Helper to decide which openocd script to use. We only support 0.3.x and 0.4.x.
-
-if [ $# -ne 1 ]
-then
-  echo "Usage: `basename $0` {flash|debug}"
-  exit 1
-fi
-
-OPENOCD_VERSION=`openocd -v 2>&1 | head -n1 | \
-                 awk '{print $4}' | sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/'`
-
-CFG_FILE=$1_${OPENOCD_VERSION}.cfg
-
-openocd -f support/openocd/$CFG_FILE