cruft up make

Makefile

@@ -32,8 +32,9 @@ submodules :
 	(cd micropython/ports/nrf; $(MAKE) submodules)
 	(cd reloader; git submodule update --init)
 
+# XXX non-free
 bootloader: build-$(BOARD_SAFE)
-	$(RM) bootloader/_build-$(BOARD)_nrf52832//$(BOARD)_nrf52832_bootloader-*-nosd.hex
+	$(RM) bootloader/_build-$(BOARD)_nrf52832/$(BOARD)_nrf52832_bootloader-*-nosd.hex
 	$(MAKE) -C bootloader/ BOARD=$(BOARD)_nrf52832 all genhex
 	$(PYTHON) tools/hexmerge.py \
 		bootloader/_build-$(BOARD)_nrf52832/$(BOARD)_nrf52832_bootloader-*-nosd.hex \
@@ -42,7 +43,7 @@ bootloader: build-$(BOARD_SAFE)
 	$(PYTHON) tools/hex2c.py build-$(BOARD)/bootloader.hex > \
 		reloader/src/boards/$(BOARD)/bootloader.h
 	$(PYTHON) -m nordicsemi dfu genpkg \
-		--bootloader bootloader/_build-$(BOARD)_nrf52832//$(BOARD)_nrf52832_bootloader-*-nosd.hex \
+		--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 \
 		build-$(BOARD)/bootloader-daflasher.zip
 
@@ -50,6 +51,7 @@ reloader: bootloader build-$(BOARD_SAFE)
 	$(MAKE) -C reloader/ BOARD=$(BOARD)
 	cp reloader/build-$(BOARD)/reloader*.zip build-$(BOARD)
 
+# XXX non-free
 softdevice:
 	micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh
 
@@ -109,9 +111,7 @@ check:
 .PHONY: bootloader reloader docs micropython
 
 dist: DIST=../wasp-os-$(VERSION)
-dist: k9
-k9: p8
-p8: pinetime
+dist: pinetime
 pinetime : mrproper
 mrproper :
 	$(RM) -r \
@@ -121,7 +121,7 @@ mrproper :
 		reloader/src/boards/*/bootloader.h \
 		micropython/mpy-cross/build \
 		micropython/ports/nrf/build-*
-k9 p8 pinetime:
+pinetime:
 	$(RM) wasp/boards/$@/watch.py
 	$(MAKE) BOARD=$@ all
 dist: docs
@@ -134,3 +134,4 @@ dist: docs
 	find $(DIST) -name __pycache__ | xargs $(RM) -r
 	tar -C .. -zcf $(DIST).tar.gz $(notdir $(DIST))
 	(cd ..; zip -9r $(DIST).zip $(notdir $(DIST)))
+