From 945546a804c06f83f62b22bf790c1c87df79adc2 Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Sat, 9 May 2020 14:09:28 +0100 Subject: [PATCH] reloader: Integrate into the main build system --- Makefile | 9 +++++++-- reloader | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0866363..fac9f59 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ export PYTHONPATH := $(PWD)/tools/nrfutil:$(PWD)/tools/intelhex:$(PYTHONPATH) -all : bootloader micropython +all : bootloader reloader micropython BOARD ?= $(error Please set BOARD=) clean : $(RM) -r \ bootloader/_build-$(BOARD)_nrf52832 \ + reloader/build-$(BOARD) reloader/src/boards/$(BOARD)/bootloader.h \ micropython/mpy-cross/build \ micropython/ports/nrf/build-$(BOARD)-s132 @@ -26,6 +27,10 @@ bootloader: python3 tools/hex2c.py bootloader.hex > \ reloader/src/boards/$(BOARD)/bootloader.h +reloader: bootloader + $(MAKE) -C reloader/ BOARD=$(BOARD) + mv reloader/build-$(BOARD)/reloader.zip . + softdevice: micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -71,5 +76,5 @@ sim: PYTHONPATH=$(PWD)/wasp/boards/simulator:$(PWD)/wasp \ python3 -i wasp/main.py -.PHONY: bootloader docs micropython +.PHONY: bootloader reloader docs micropython diff --git a/reloader b/reloader index 5e9a1c8..6c403fb 160000 --- a/reloader +++ b/reloader @@ -1 +1 @@ -Subproject commit 5e9a1c85509130af123735aa550ef36b53f772b7 +Subproject commit 6c403fb0bb04782a3aff6902b4935b9aad9d4a51