pinetime/wasp-os
1
0
Fork 0
Code Activity

reloader: Integrate into the main build system

Browse source
This commit is contained in:
Daniel Thompson 2020-05-09 14:09:28 +01:00
parent 59ae03fc67
commit 945546a804
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1,12 +1,13 @@
export PYTHONPATH := $(PWD)/tools/nrfutil:$(PWD)/tools/intelhex:$(PYTHONPATH) export PYTHONPATH := $(PWD)/tools/nrfutil:$(PWD)/tools/intelhex:$(PYTHONPATH)
all : bootloader micropython all : bootloader reloader micropython
BOARD ?= $(error Please set BOARD=) BOARD ?= $(error Please set BOARD=)
clean : clean :
$(RM) -r \ $(RM) -r \
bootloader/_build-$(BOARD)_nrf52832 \ bootloader/_build-$(BOARD)_nrf52832 \
reloader/build-$(BOARD) reloader/src/boards/$(BOARD)/bootloader.h \
micropython/mpy-cross/build \ micropython/mpy-cross/build \
micropython/ports/nrf/build-$(BOARD)-s132 micropython/ports/nrf/build-$(BOARD)-s132
@ -26,6 +27,10 @@ bootloader:
python3 tools/hex2c.py bootloader.hex > \ python3 tools/hex2c.py bootloader.hex > \
reloader/src/boards/$(BOARD)/bootloader.h reloader/src/boards/$(BOARD)/bootloader.h
reloader: bootloader
$(MAKE) -C reloader/ BOARD=$(BOARD)
mv reloader/build-$(BOARD)/reloader.zip .
softdevice: softdevice:
micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh
@ -71,5 +76,5 @@ sim:
PYTHONPATH=$(PWD)/wasp/boards/simulator:$(PWD)/wasp \ PYTHONPATH=$(PWD)/wasp/boards/simulator:$(PWD)/wasp \
python3 -i wasp/main.py python3 -i wasp/main.py
.PHONY: bootloader docs micropython .PHONY: bootloader reloader docs micropython

2
reloader

@ -1 +1 @@
Subproject commit 5e9a1c85509130af123735aa550ef36b53f772b7 Subproject commit 6c403fb0bb04782a3aff6902b4935b9aad9d4a51