diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-04-16 15:27:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 15:27:44 -0700 |
| commit | 7f7cbe8efa7d61683872fa93629491bce7ef5135 (patch) | |
| tree | 0701d8d3a0538ada755a1eacad2a6a70a8fee87b | |
| parent | 81d395d8256ce0b4d5a2a37dd2f4b5ec789da2a5 (diff) | |
| parent | 926849d7a89031aff98b2007025847ebfab11806 (diff) | |
Merge pull request #760 from ladyada/master
don't use python nrfutil on windows, go with exe we have in repo
| -rw-r--r-- | ports/nrf/boards/feather52/mpconfigboard.mk | 12 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52840/mpconfigboard_s140.mk | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/feather52/mpconfigboard.mk index b6a4f795b..1e3aa5a24 100644 --- a/ports/nrf/boards/feather52/mpconfigboard.mk +++ b/ports/nrf/boards/feather52/mpconfigboard.mk @@ -8,6 +8,12 @@ BOOTLOADER_PKG = boards/feather52/bootloader/feather52_bootloader_$(SOFTDEV_VERS NRF_DEFINES += -DNRF52832_XXAA +ifeq ($(OS),Windows_NT) + NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe +else + NRFUTIL = nrfutil +endif + ifeq ($(SD), ) INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT) @@ -25,12 +31,12 @@ __check_defined = \ .PHONY: dfu-gen dfu-flash boot-flash dfu-gen: - nrfutil dfu genpkg --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip + $(NRFUTIL) dfu genpkg --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip dfu-flash: @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0) - nrfutil dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200 + $(NRFUTIL) dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200 boot-flash: @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0) - nrfutil dfu serial --package $(BOOTLOADER_PKG) -p $(SERIAL) -b 115200 + $(NRFUTIL) dfu serial --package $(BOOTLOADER_PKG) -p $(SERIAL) -b 115200 diff --git a/ports/nrf/boards/feather52840/mpconfigboard_s140.mk b/ports/nrf/boards/feather52840/mpconfigboard_s140.mk index 4fb79e13e..cc64b2c3c 100644 --- a/ports/nrf/boards/feather52840/mpconfigboard_s140.mk +++ b/ports/nrf/boards/feather52840/mpconfigboard_s140.mk @@ -8,6 +8,12 @@ BOOTLOADER_FILENAME = boards/feather52840/bootloader/feather52840_bootloader_6.0 NRF_DEFINES += -DNRF52840_XXAA +ifeq ($(OS),Windows_NT) + NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe +else + NRFUTIL = nrfutil +endif + CFLAGS += -DADAFRUIT_FEATHER52840 ifeq ($(SD), ) @@ -25,11 +31,11 @@ __check_defined = \ .PHONY: dfu-gen dfu-flash boot-flash dfu-gen: - nrfutil dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip + $(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip dfu-flash: @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0) - nrfutil --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200 + $(NRFUTIL) --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200 boot-flash: nrfjprog --program $(BOOTLOADER_FILENAME).hex -f nrf52 --chiperase --reset |