Fixed MacOS compatibility + python3 requirement

pull/6/head
Daniele Lacamera 2019-04-24 20:14:06 +02:00
parent 75fc9cc59a
commit 94af1b74cb
4 changed files with 7 additions and 8 deletions

View File

@ -151,14 +151,14 @@ test-app/image.bin:
include tools/test.mk
ed25519.der:
@tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ed25519_pub_key.c
@python3 tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ed25519_pub_key.c
ecc256.der:
@tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ecc256_pub_key.c
@python3 tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ecc256_pub_key.c
factory.bin: $(BOOT_IMG) wolfboot-align.bin $(PRIVATE_KEY)
@echo "\t[SIGN] $(BOOT_IMG)"
$(Q)tools/keytools/sign.py $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1
$(Q)python3 tools/keytools/sign.py $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1
@echo "\t[MERGE] $@"
@cat wolfboot-align.bin test-app/image_v1_signed.bin > $@

View File

@ -21,8 +21,7 @@ projects to provide a secure firmware update mechanism.
This repository contains the following components:
- the wolfBoot bootloader
- Ed25519 key generator and image signing tools
- Ecc256 key generator and image signing tools
- key generator and image signing tools (requires python 3.x)
- Baremetal test applications
### wolfBoot bootloader

@ -1 +1 @@
Subproject commit e4059a65b9b53ea2817b81afe6a0562ad6a5d342
Subproject commit eaf5c3042d71b60ae246f781d6f92af51455915d

View File

@ -43,7 +43,7 @@ test-spi-off: FORCE
test-update: test-app/image.bin FORCE
@dd if=/dev/zero bs=131067 count=1 2>/dev/null | tr "\000" "\377" > test-update.bin
@$(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
@python3 $(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
@dd if=test-app/image_v$(TEST_UPDATE_VERSION)_signed.bin of=test-update.bin bs=1 conv=notrunc
@printf "pBOOT" >> test-update.bin
@make test-reset
@ -53,7 +53,7 @@ test-update: test-app/image.bin FORCE
(make test-reset && sleep 1 && st-flash --reset write test-update.bin 0x08040000)
test-update-ext: test-app/image.bin FORCE
@$(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
@python3 $(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
@$$(dd if=/dev/zero bs=1M count=1 | tr '\000' '\377' > test-update.rom)
@dd if=test-app/image_v$(TEST_UPDATE_VERSION)_signed.bin of=test-update.rom bs=1 count=524283 conv=notrunc
@printf "pBOOT" | dd of=test-update.rom obs=1 seek=524283 count=5 conv=notrunc