Skip to content

Commit 1c4accf

Browse files
hathachhathach
committed
Merge branch 'nrf52_remove_boot_target' into nrf52_dfu_touch1200
2 parents b7dd33b + e1ccc07 commit 1c4accf

4 files changed

Lines changed: 12 additions & 24 deletions

File tree

‎ports/nrf/Makefile‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
248248
$(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
249249
$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
250250

251-
.phony: all flash sd binary hex bootloader
251+
.phony: all flash sd binary hex
252252

253253
all: binary hex uf2
254254

@@ -266,6 +266,11 @@ hex: $(BUILD)/$(OUTPUT_FILENAME).hex
266266
$(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).elf
267267
$(OBJCOPY) -O ihex $< $@
268268

269+
## Create uf2 file
270+
uf2: $(BUILD)/$(OUTPUT_FILENAME).hex
271+
$(ECHO) "Create $(OUTPUT_FILENAME).uf2"
272+
$(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" $^
273+
269274
#####################
270275
# Flash with debugger
271276
#####################
@@ -286,9 +291,6 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).hex
286291
nrfjprog --program $< --sectorerase -f $(MCU_VARIANT)
287292
nrfjprog --reset -f $(MCU_VARIANT)
288293

289-
bootloader:
290-
nrfjprog --program $(BOOT_FILE).hex -f nrf52 --chiperase --reset
291-
292294
else ifeq ($(FLASHER), pyocd)
293295

294296
flash: $(BUILD)/$(OUTPUT_FILENAME).hex
@@ -303,16 +305,12 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).hex
303305
pyocd-flashtool -t $(MCU_SUB_VARIANT) $< --sector_erase
304306
pyocd-tool -t $(MCU_SUB_VARIANT) reset $(BOOT_SETTING_ADDR)
305307

306-
bootloader:
307-
pyocd-flashtool -t $(MCU_SUB_VARIANT) $(BOOT_FILE).hex --chip_erase
308-
pyocd-tool -t $(MCU_SUB_VARIANT) reset
309-
310308
endif
311309

312310
#####################
313311
# Flash with DFU
314312
#####################
315-
.phony: dfu-gen dfu-flash dfu-bootloader
313+
.phony: dfu-gen dfu-flash
316314

317315
NRFUTIL = adafruit-nrfutil
318316

@@ -329,22 +327,16 @@ __check_defined = \
329327
$(if $(value $1),, \
330328
$(error Undefined make flag: $1$(if $2, ($2))))
331329

332-
dfu-gen: $(BUILD)/$(OUTPUT_FILENAME).hex
333-
$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
334-
330+
## Flash with DFU serial
335331
dfu-flash: $(BUILD)/dfu-package.zip
336332
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
337333
$(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
338334

339-
dfu-bootloader:
340-
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
341-
$(NRFUTIL) --verbose dfu serial --package $(BOOT_FILE).zip -p $(SERIAL) -b 115200
335+
## Create DFU package file
336+
dfu-gen: $(BUILD)/dfu-package.zip
342337

343-
uf2: $(BUILD)/$(OUTPUT_FILENAME).hex
344-
$(ECHO) "Create $(OUTPUT_FILENAME).uf2"
345-
$(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" $^
346-
347-
$(BUILD)/dfu-package.zip: dfu-gen
338+
$(BUILD)/dfu-package.zip: $(BUILD)/$(OUTPUT_FILENAME).hex
339+
$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
348340

349341
$(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
350342
$(ECHO) "LINK $@"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ SD ?= s132
55
SOFTDEV_VERSION ?= 2.0.1
66

77
LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
8-
BOOT_FILE = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single
98

109
BOOT_SETTING_ADDR = 0x7F000
1110
NRF_DEFINES += -DNRF52832_XXAA

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ SD ?= s140
55
SOFTDEV_VERSION ?= 6.0.0
66

77
BOOT_SETTING_ADDR = 0xFF000
8-
BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140
98

109
ifeq ($(SD),)
1110
LD_FILE = boards/nrf52840_1M_256k.ld

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ SD ?= s140
55
SOFTDEV_VERSION ?= 6.0.0
66

77
BOOT_SETTING_ADDR = 0xFF000
8-
BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140
98

109
ifeq ($(SD),)
1110
LD_FILE = boards/nrf52840_1M_256k.ld
1211
else
1312
LD_FILE = boards/bluefruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_$(SOFTDEV_VERSION).ld
1413
endif
1514

16-
1715
NRF_DEFINES += -DNRF52840_XXAA

0 commit comments

Comments
 (0)