Merge pull request #158 from nitz/feature-pyocd-flasher

Add pyocd flash targets.

Author: hathach

Makefile

@@ -44,8 +44,25 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
 SIZE    = $(CROSS_COMPILE)size
 GDB     = $(CROSS_COMPILE)gdb
 
+# Flasher utility options
 NRFUTIL = adafruit-nrfutil
 NRFJPROG = nrfjprog
+FLASHER ?= nrfjprog
+PYOCD ?= pyocd
+
+# Flasher will default to nrfjprog,
+# Check for pyocd, error on unexpected value.
+ifeq ($(FLASHER),nrfjprog)
+  FLASH_CMD = $(NRFJPROG) --program $1 --sectoranduicrerase -f nrf52 --reset
+  FLASH_NOUICR_CMD = $(NRFJPROG) --program $1 -f nrf52 --sectorerase --reset
+  FLASH_ERASE_CMD = $(NRFJPROG) -f nrf52 --eraseall
+else ifeq ($(FLASHER),pyocd)
+  FLASH_CMD = $(PYOCD) flash -t $(MCU_SUB_VARIANT) $1
+  FLASH_NOUICR_CMD = $(PYOCD) flash -t $(MCU_SUB_VARIANT) $1
+  FLASH_ERASE_CMD = $(PYOCD) erase -t $(MCU_SUB_VARIANT) --chip
+else
+  $(error Unsupported flash utility: "$(FLASHER)")
+endif
 
 # Set make directory command, Windows tries to create a directory named "-p" if that flag is there.
 ifneq ($(OS), Windows_NT)
@@ -390,26 +407,30 @@ __check_defined = \
 # Flash the compiled
 flash: $(BUILD)/$(OUT_FILE)-nosd.hex
 	@echo Flashing: $(notdir $<)
-	$(NRFJPROG) --program $< --sectoranduicrerase -f nrf52 --reset
-
-# dfu using CDC interface
-dfu-flash: $(BUILD)/$(MERGED_FILE).zip
-	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
-	$(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200
+	$(call FLASH_CMD,$<)
 
 erase:
 	@echo Erasing flash
-	$(NRFJPROG) -f nrf52 --eraseall
+	$(call FLASH_ERASE_CMD)
 
 # flash SD only
 sd:
 	@echo Flashing: $(SD_HEX)
-	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --sectorerase --reset
+	$(call FLASH_NOUICR_CMD,$(SD_HEX))
 
 # flash MBR only
 mbr:
 	@echo Flashing: $(MBR_HEX)
-	$(NRFJPROG) --program $(MBR_HEX) -f nrf52 --sectorerase --reset
+	$(call FLASH_NOUICR_CMD,$(MBR_HEX))
+
+#------------------- Flash with NRFUTIL via DFU -------------------
+
+# dfu using CDC interface
+dfu-flash: $(BUILD)/$(MERGED_FILE).zip
+	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
+	$(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200
+
+#------------------- Debugging -------------------
 
 gdbflash: $(BUILD)/$(MERGED_FILE).hex
 	@echo Flashing: $<