djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add uf2, bootloader target

Browse Source
This commit is contained in:
hathach 2018-06-25 23:31:14 +07:00
parent 4d45565663
commit 54547683f9
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nrf/Makefile
View File

@ -249,7 +249,7 @@ FLASHER ?=
ifeq ($(FLASHER),) ifeq ($(FLASHER),)
# Adafruit use bootloader that requires writing to its settting ( app valid = 0x0001, crc = 0x0000 ) # Adafruit use bootloader that requires writing to its settting ( app valid = 0x0001, crc = 0x0000 )
ifneq (,$(filter $(BOARD),feather52 feather52840)) ifneq (,$(filter $(BOARD),feather52832 feather52840))
flash: $(BUILD)/$(OUTPUT_FILENAME).hex flash: $(BUILD)/$(OUTPUT_FILENAME).hex
nrfjprog --program $< --sectorerase -f $(MCU_VARIANT) nrfjprog --program $< --sectorerase -f $(MCU_VARIANT)

23
ports/nrf/boards/feather52840/mpconfigboard.mk
View File

@ -3,8 +3,8 @@ MCU_VARIANT = nrf52
MCU_SUB_VARIANT = nrf52840 MCU_SUB_VARIANT = nrf52840
SOFTDEV_VERSION ?= 6.0.0 SOFTDEV_VERSION ?= 6.0.0
LD_FILE = boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld LD_FILE = boards/feather52840/bluefruit_nrf52840_s140_$(SOFTDEV_VERSION).ld
BOOTLOADER_FILENAME = boards/feather52840/bootloader/feather52840_bootloader_6.0.0_s140_single BOOT_FILE = boards/feather52840/bootloader/feather52840_bootloader_$(SOFTDEV_VERSION)_s140_single
NRF_DEFINES += -DNRF52840_XXAA NRF_DEFINES += -DNRF52840_XXAA
@ -23,14 +23,25 @@ __check_defined = \
$(if $(value $1),, \ $(if $(value $1),, \
$(error Undefined make flag: $1$(if $2, ($2)))) $(error Undefined make flag: $1$(if $2, ($2))))
.PHONY: dfu-gen dfu-flash boot-flash .PHONY: dfu-gen dfu-flash dfu-bootloader uf2 bootloader
uf2:
$(ECHO) "Create $(OUTPUT_FILENAME).uf2"
$(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" "$(BUILD)/$(OUTPUT_FILENAME).hex"
# Flash with DFU
dfu-gen: 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: dfu-flash:
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0) @:$(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 --singlebank
boot-flash: dfu-bootloader:
nrfjprog --program $(BOOTLOADER_FILENAME).hex -f nrf52 --chiperase --reset @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
$(NRFUTIL) --verbose dfu serial --package $(BOOT_FILE).zip -p $(SERIAL) -b 115200
# Flash with jlink
bootloader:
nrfjprog --program $(BOOT_FILE).hex -f nrf52 --chiperase --reset