From 19d354ed050c2470692ad2b23e6b0e8119a609ce Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Sun, 8 Jan 2017 15:17:03 +0100 Subject: [PATCH] nrf5: Updating to use new nrfjprog in makefile. Needed for nrf52840 targets. Changed from pinreset to debug reset. --- nrf5/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nrf5/Makefile b/nrf5/Makefile index 7aa0dd52a7..934bd648c9 100644 --- a/nrf5/Makefile +++ b/nrf5/Makefile @@ -190,13 +190,13 @@ ifeq ($(FLASHER),) flash: $(BUILD)/firmware.elf nrfjprog --program $(BUILD)/firmware.hex --sectorerase -f $(MCU_VARIANT) - nrfjprog --pinreset -f $(MCU_VARIANT) + nrfjprog --reset -f $(MCU_VARIANT) sd: nrfjprog --eraseall -f $(MCU_VARIANT) nrfjprog --program $(SOFTDEV_HEX) -f $(MCU_VARIANT) nrfjprog --program $(BUILD)/firmware.hex --sectorerase -f $(MCU_VARIANT) - nrfjprog --pinreset -f $(MCU_VARIANT) + nrfjprog --reset -f $(MCU_VARIANT) else ifeq ($(FLASHER), pyocd)