Merge pull request #26 from WyliodrinEmbeddedIoT/microbit2_flashing_script

microbit_v2: fixed openocd flashing script

Author: bradjc

boards/microbit_v2-bootloader/Makefile

@@ -15,8 +15,8 @@ OPENOCD_OPTIONS=-f openocd.cfg
 # Upload the kernel over JTAG
 .PHONY: flash
 flash: $(TOCK_ROOT_DIRECTORY)target/$(TARGET)/release/$(PLATFORM).bin
-	$(OPENOCD) $(OPENOCD_OPTIONS) -c "program $<; verify_image $<; reset; shutdown;"
+	$(OPENOCD) $(OPENOCD_OPTIONS) -c "program $<; verify_image $<; reset halt; shutdown;"
 
 .PHONY: flash
 flash-debug: $(TOCK_ROOT_DIRECTORY)target/$(TARGET)/debug/$(PLATFORM).bin
-	$(OPENOCD) $(OPENOCD_OPTIONS) -c "program $<; verify_image $<; reset; shutdown;"
+	$(OPENOCD) $(OPENOCD_OPTIONS) -c "program $<; verify_image $<; reset halt; shutdown;"

boards/microbit_v2-bootloader/openocd.cfg

@@ -2,10 +2,11 @@ source [find interface/cmsis-dap.cfg]
 transport select swd
 source [find target/nrf52.cfg]
 
-set WORKAREASIZE 0x40000
-
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $WORKAREASIZE -work-area-backup 0
-
-flash bank $_CHIPNAME.flash nrf51 0x00000000 0 1 1 $_TARGETNAME
-flash bank $_CHIPNAME.uicr nrf51 0x10001000 0 1 1 $_TARGETNAME
-
+# necessary to be backward compatible with openocd 0.10
+if { [flash list] == "" } {
+    set WORKAREASIZE 0x40000
+    $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $WORKAREASIZE -work-area-backup 0
+
+    flash bank $_CHIPNAME.flash nrf51 0x00000000 0 1 1 $_TARGETNAME
+    flash bank $_CHIPNAME.uicr nrf51 0x10001000 0 1 1 $_TARGETNAME
+}