[Labs setup] Pushing changes to correspond to git issue lowRISC#116. Can communicate with board, but loading program via uart still yeilds an error

Author: lbiernac

container/Dockerfile

@@ -59,7 +59,7 @@ RUN tar -C / -xf openfpgaloader.tar.gz --strip-components=1
 # Build OpenOCD
 RUN git clone https://github.com/openocd-org/openocd.git \
     && cd openocd \
-    && git checkout v0.11.0 \
+    && git checkout v0.12.0 \
     && ./bootstrap \
     && ./configure \
     && make \

pulp_riscv_dbg.core

@@ -42,5 +42,6 @@ targets:
     filesets:
       - files_src
       - tool_verilator ? (files_verilator)
-      - "use_bscane_tap ? (files_xilinx_bscane_tap)"
-      - "!use_bscane_tap ? (files_jtag_tap)"
+      - files_xilinx_bscane_tap
+      # - "use_bscane_tap ? (files_xilinx_bscane_tap)"
+      # - "!use_bscane_tap ? (files_jtag_tap)"

util/arty-a7-openocd-cfg.tcl

@@ -5,20 +5,18 @@
 adapter driver ftdi
 transport select jtag
 
-ftdi_device_desc "Digilent USB Device"
-ftdi_vid_pid 0x0403 0x6010
-ftdi_channel 0
-ftdi_layout_init 0x0088 0x008b
+ftdi device_desc "Digilent USB Device" 
+ftdi vid_pid 0x0403 0x6010
+ftdi channel 1
+ftdi layout_init 0x0088 0x008b
 reset_config none
 
 # Configure JTAG chain and the target processor
 set _CHIPNAME riscv
 
 # Configure JTAG expected ID
-# arty-a7-35t
-set _EXPECTED_ID 0x0362D093 
 # arty-a7-100t
-# set _EXPECTED_ID 0x13631093 
+set _EXPECTED_ID 0x13631093 
 
 jtag newtap $_CHIPNAME cpu -irlen 6 -expected-id $_EXPECTED_ID -ignore-version
 set _TARGETNAME $_CHIPNAME.cpu
@@ -30,7 +28,7 @@ riscv set_ir dmi 0x23
 
 adapter speed 10000
 
-riscv set_prefer_sba on
+# riscv set_prefer_sba on # LB: Commented out for git issue #116
 gdb_report_data_abort enable
 gdb_report_register_access_error enable
 gdb_breakpoint_override hard

util/load_demo_system.sh

@@ -35,7 +35,7 @@ if [ $1 = "run" ]; then
   EXIT_CMD='-c "exit"'
 fi
 
-openocd -f $TCL_FILE -c "load_image $2 0x0" \
+/tools/openocd/src/openocd -f $TCL_FILE -c "load_image $2 0x0" \
  -c "verify_image $2 0x0" \
  -c "echo \"Doing reset\"" \
  -c "reset $1" \