pinetime/wasp-os
1
0
Fork 0
Code Activity

Makefile: Seperate the builds by board

Browse source 
wasp-os is starting to developer proper support for multiple boards
(currently other boards such as nitrogen and ds-d6 test builds and
proof-of-concept stuff) then we need to start placing binaries for each
device into seperate directories (other wise creating a binary distro
won't work).

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
This commit is contained in:
Daniel Thompson 2020-08-02 12:12:37 +01:00
parent 58fb5d630b
commit 5c30b2e0f0
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -22,28 +22,28 @@ clean :
submodules : submodules :
git submodule update --init --recursive git submodule update --init --recursive
bootloader: bootloader: build-$(BOARD)
$(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 $(MAKE) -C bootloader/ BOARD=$(BOARD)_nrf52832 all genhex
python3 tools/hexmerge.py \ python3 tools/hexmerge.py \
bootloader/_build-$(BOARD)_nrf52832/$(BOARD)_nrf52832_bootloader-*-nosd.hex \ bootloader/_build-$(BOARD)_nrf52832/$(BOARD)_nrf52832_bootloader-*-nosd.hex \
bootloader/lib/softdevice/s132_nrf52_6.1.1/s132_nrf52_6.1.1_softdevice.hex \ bootloader/lib/softdevice/s132_nrf52_6.1.1/s132_nrf52_6.1.1_softdevice.hex \
-o bootloader.hex -o build-$(BOARD)/bootloader.hex
python3 tools/hex2c.py bootloader.hex > \ python3 tools/hex2c.py build-$(BOARD)/bootloader.hex > \
reloader/src/boards/$(BOARD)/bootloader.h reloader/src/boards/$(BOARD)/bootloader.h
python3 -m nordicsemi dfu genpkg \ python3 -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 \ --softdevice bootloader/lib/softdevice/s132_nrf52_6.1.1/s132_nrf52_6.1.1_softdevice.hex \
bootloader-daflasher.zip build-$(BOARD)/bootloader-daflasher.zip
reloader: bootloader reloader: bootloader build-$(BOARD)
$(MAKE) -C reloader/ BOARD=$(BOARD) $(MAKE) -C reloader/ BOARD=$(BOARD)
mv reloader/build-$(BOARD)/reloader.zip . mv reloader/build-$(BOARD)/reloader.zip build-$(BOARD)/
softdevice: softdevice:
micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh micropython/ports/nrf/drivers/bluetooth/download_ble_stack.sh
micropython: $(WASP_WATCH_PY) micropython: $(WASP_WATCH_PY) build-$(BOARD)
$(MAKE) -C micropython/mpy-cross $(MAKE) -C micropython/mpy-cross
$(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c $(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c
$(MAKE) -C micropython/ports/nrf \ $(MAKE) -C micropython/ports/nrf \
@ -54,7 +54,10 @@ micropython: $(WASP_WATCH_PY)
python3 -m nordicsemi dfu genpkg \ python3 -m nordicsemi dfu genpkg \
--dev-type 0x0052 \ --dev-type 0x0052 \
--application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \ --application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \
micropython.zip build-$(BOARD)/micropython.zip
build-$(BOARD):
mkdir -p $@
dfu: dfu:
python3 -m nordicsemi dfu serial --package micropython.zip --port /dev/ttyACM0 python3 -m nordicsemi dfu serial --package micropython.zip --port /dev/ttyACM0