Skip to content

Commit 7f7cbe8

Browse files
tannewttannewt
authored
Merge pull request adafruit#760 from ladyada/master
don't use python nrfutil on windows, go with exe we have in repo
2 parents 81d395d + 926849d commit 7f7cbe8

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

‎ports/nrf/boards/feather52/mpconfigboard.mk‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ BOOTLOADER_PKG = boards/feather52/bootloader/feather52_bootloader_$(SOFTDEV_VERS
88

99
NRF_DEFINES += -DNRF52832_XXAA
1010

11+
ifeq ($(OS),Windows_NT)
12+
NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
13+
else
14+
NRFUTIL = nrfutil
15+
endif
16+
1117
ifeq ($(SD), )
1218
INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
1319
INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
@@ -25,12 +31,12 @@ __check_defined = \
2531
.PHONY: dfu-gen dfu-flash boot-flash
2632

2733
dfu-gen:
28-
nrfutil dfu genpkg --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
34+
$(NRFUTIL) dfu genpkg --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
2935

3036
dfu-flash:
3137
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
32-
nrfutil dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
38+
$(NRFUTIL) dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
3339

3440
boot-flash:
3541
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
36-
nrfutil dfu serial --package $(BOOTLOADER_PKG) -p $(SERIAL) -b 115200
42+
$(NRFUTIL) dfu serial --package $(BOOTLOADER_PKG) -p $(SERIAL) -b 115200

‎ports/nrf/boards/feather52840/mpconfigboard_s140.mk‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ BOOTLOADER_FILENAME = boards/feather52840/bootloader/feather52840_bootloader_6.0
88

99
NRF_DEFINES += -DNRF52840_XXAA
1010

11+
ifeq ($(OS),Windows_NT)
12+
NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
13+
else
14+
NRFUTIL = nrfutil
15+
endif
16+
1117
CFLAGS += -DADAFRUIT_FEATHER52840
1218

1319
ifeq ($(SD), )
@@ -25,11 +31,11 @@ __check_defined = \
2531
.PHONY: dfu-gen dfu-flash boot-flash
2632

2733
dfu-gen:
28-
nrfutil dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
34+
$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
2935

3036
dfu-flash:
3137
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
32-
nrfutil --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
38+
$(NRFUTIL) --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
3339

3440
boot-flash:
3541
nrfjprog --program $(BOOTLOADER_FILENAME).hex -f nrf52 --chiperase --reset

0 commit comments

Comments
 (0)