From a9ca9cfe132068488a7a39c7bb6aac69d7936ae6 Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Sun, 26 Jul 2020 21:03:30 +0100
Subject: Makefile: Allow installation via DaFlasher

Generate a .zip file that works with SoftDevice 2.0.1 (still looking
for the recipe that works with 5.0), fix up the bootloader to work with
DaFlasher and add an extra feature in micropython to cope better.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>

diff --git a/Makefile b/Makefile
index 6b94687..df9afcf 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,10 @@ bootloader:
 		-o bootloader.hex
 	python3 tools/hex2c.py bootloader.hex > \
 		reloader/src/boards/$(BOARD)/bootloader.h
+	python3 -m nordicsemi dfu genpkg \
+		--bootloader bootloader/_build-$(BOARD)_nrf52832//$(BOARD)_nrf52832_bootloader-*-nosd.hex \
+		--softdevice bootloader/lib/softdevice/s132_nrf52_6.1.1/s132_nrf52_6.1.1_softdevice.hex \
+		bootloader-daflasher.zip
 
 reloader: bootloader
 	$(MAKE) -C reloader/ BOARD=$(BOARD)
diff --git a/bootloader b/bootloader
index 9148e76..85a9b76 160000
--- a/bootloader
+++ b/bootloader
@@ -1 +1 @@
-Subproject commit 9148e76c4138dbdb9bd1ddf7d125274e6262e221
+Subproject commit 85a9b76d8451eba2e2c9e5d9b3b1b8450178105f
diff --git a/micropython b/micropython
index 9d5e23f..89f48ac 160000
--- a/micropython
+++ b/micropython
@@ -1 +1 @@
-Subproject commit 9d5e23fc71a54c64f21ae762050f4612530d65d6
+Subproject commit 89f48aca20920073d0c88782df0a8881651a5b28
-- 
cgit v0.10.2