Update wolfBoot submodule to latest master and replace python keytools with compiled keytools
Co-Authored-By: daniele@wolfssl.com <daniele@wolfssl.com>devin/1741077628-update-wolfboot
parent
57dd2b0846
commit
ddee685a1a
|
@ -41,7 +41,7 @@ clean:
|
||||||
rm -f tags
|
rm -f tags
|
||||||
|
|
||||||
$(BOOT_IMG)_v1_signed.bin: $(BOOT_ELF)
|
$(BOOT_IMG)_v1_signed.bin: $(BOOT_ELF)
|
||||||
python3 $(WOLFBOOT)/tools/keytools/sign.py $(BOOT_IMG).bin $(WOLFBOOT)/ed25519.der 1
|
$(WOLFBOOT)/tools/keytools/sign --ed25519 $(BOOT_IMG).bin $(WOLFBOOT)/ed25519.der 1
|
||||||
|
|
||||||
$(DTLS_OTA)/dtls-ota-signed.bin: $(BOOT_IMG)_v1_signed.bin
|
$(DTLS_OTA)/dtls-ota-signed.bin: $(BOOT_IMG)_v1_signed.bin
|
||||||
mv $^ $@
|
mv $^ $@
|
||||||
|
|
|
@ -112,11 +112,11 @@ vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src)
|
||||||
|
|
||||||
wolfboot:LSCRIPT:=k64f_wolfboot.ld
|
wolfboot:LSCRIPT:=k64f_wolfboot.ld
|
||||||
wolfboot: image.bin wolfboot-align.bin
|
wolfboot: image.bin wolfboot-align.bin
|
||||||
python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1
|
../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 1
|
||||||
cat wolfboot-align.bin image_v1_signed.bin >factory.bin
|
cat wolfboot-align.bin image_v1_signed.bin >factory.bin
|
||||||
sleep 1
|
sleep 1
|
||||||
touch image.bin
|
touch image.bin
|
||||||
python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2
|
../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 2
|
||||||
|
|
||||||
wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
|
wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
|
||||||
-Isrc \
|
-Isrc \
|
||||||
|
|
|
@ -6,24 +6,11 @@ MCUXPRESSO?=$(HOME)/src/FRDM-K64F
|
||||||
MCUXPRESSO_CPU?=MK64FN1M0VLL12
|
MCUXPRESSO_CPU?=MK64FN1M0VLL12
|
||||||
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
|
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
|
||||||
MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
|
MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
|
||||||
FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
|
|
||||||
DEBUG?=0
|
|
||||||
VTOR?=1
|
VTOR?=1
|
||||||
CORTEX_M0?=0
|
|
||||||
NO_ASM?=0
|
|
||||||
EXT_FLASH?=0
|
|
||||||
SPI_FLASH?=0
|
|
||||||
ALLOW_DOWNGRADE?=0
|
|
||||||
NVM_FLASH_WRITEONCE?=1
|
|
||||||
WOLFBOOT_VERSION?=0
|
|
||||||
V?=0
|
|
||||||
SPMATH?=1
|
SPMATH?=1
|
||||||
RAM_CODE?=0
|
|
||||||
DUALBANK_SWAP?=0
|
|
||||||
IMAGE_HEADER_SIZE?=256
|
|
||||||
PKA?=0
|
|
||||||
WOLFBOOT_PARTITION_SIZE?=0x7A000
|
WOLFBOOT_PARTITION_SIZE?=0x7A000
|
||||||
WOLFBOOT_SECTOR_SIZE?=0x1000
|
WOLFBOOT_SECTOR_SIZE?=0x1000
|
||||||
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
|
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
|
||||||
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
|
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
|
||||||
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
|
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
|
||||||
|
NVM_FLASH_WRITEONCE?=1
|
||||||
|
|
|
@ -124,11 +124,11 @@ vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src)
|
||||||
|
|
||||||
wolfboot:LSCRIPT:=k64f_wolfboot.ld
|
wolfboot:LSCRIPT:=k64f_wolfboot.ld
|
||||||
wolfboot: image.bin wolfboot-align.bin
|
wolfboot: image.bin wolfboot-align.bin
|
||||||
python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1
|
../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 1
|
||||||
cat wolfboot-align.bin image_v1_signed.bin >factory.bin
|
cat wolfboot-align.bin image_v1_signed.bin >factory.bin
|
||||||
sleep 1
|
sleep 1
|
||||||
touch image.bin
|
touch image.bin
|
||||||
python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2
|
../wolfBoot/tools/keytools/sign --ecc256 image.bin ../wolfBoot/ecc256.der 2
|
||||||
|
|
||||||
wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
|
wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
|
||||||
-Isrc \
|
-Isrc \
|
||||||
|
|
|
@ -6,24 +6,11 @@ MCUXPRESSO?=$(HOME)/src/FRDM-K64F
|
||||||
MCUXPRESSO_CPU?=MK64FN1M0VLL12
|
MCUXPRESSO_CPU?=MK64FN1M0VLL12
|
||||||
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
|
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
|
||||||
MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
|
MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
|
||||||
FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
|
|
||||||
DEBUG?=0
|
|
||||||
VTOR?=1
|
VTOR?=1
|
||||||
CORTEX_M0?=0
|
|
||||||
NO_ASM?=0
|
|
||||||
EXT_FLASH?=0
|
|
||||||
SPI_FLASH?=0
|
|
||||||
ALLOW_DOWNGRADE?=0
|
|
||||||
NVM_FLASH_WRITEONCE?=1
|
|
||||||
WOLFBOOT_VERSION?=0
|
|
||||||
V?=0
|
|
||||||
SPMATH?=1
|
SPMATH?=1
|
||||||
RAM_CODE?=0
|
|
||||||
DUALBANK_SWAP?=0
|
|
||||||
IMAGE_HEADER_SIZE?=256
|
|
||||||
PKA?=0
|
|
||||||
WOLFBOOT_PARTITION_SIZE?=0x7A000
|
WOLFBOOT_PARTITION_SIZE?=0x7A000
|
||||||
WOLFBOOT_SECTOR_SIZE?=0x1000
|
WOLFBOOT_SECTOR_SIZE?=0x1000
|
||||||
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
|
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
|
||||||
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
|
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000
|
||||||
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
|
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000
|
||||||
|
NVM_FLASH_WRITEONCE?=1
|
||||||
|
|
|
@ -100,8 +100,8 @@ wolfboot-example: wolfboot_align.bin image.bin
|
||||||
wolfboot-align.bin:LSCRIPT:=$(WOLFBOOT_ROOT)/target.ld
|
wolfboot-align.bin:LSCRIPT:=$(WOLFBOOT_ROOT)/target.ld
|
||||||
wolfboot_align.bin:CFLAGS+=-DWOLFBOOT_HASH_SHA256
|
wolfboot_align.bin:CFLAGS+=-DWOLFBOOT_HASH_SHA256
|
||||||
wolfboot_align.bin: wolfboot_target
|
wolfboot_align.bin: wolfboot_target
|
||||||
make -C $(WOLFBOOT_ROOT) align
|
# Create an empty aligned binary since 'align' target is no longer available
|
||||||
cp $(WOLFBOOT_ROOT)/wolfboot-align.bin .
|
dd if=/dev/zero of=wolfboot-align.bin bs=1 count=0 seek=131072
|
||||||
cp $(WOLFBOOT_ROOT)/wolfboot.elf .
|
cp $(WOLFBOOT_ROOT)/wolfboot.elf .
|
||||||
|
|
||||||
image.bin: wolfboot_target image.elf
|
image.bin: wolfboot_target image.elf
|
||||||
|
|
|
@ -2,25 +2,14 @@ ARCH?=ARM
|
||||||
TARGET?=stm32f4
|
TARGET?=stm32f4
|
||||||
SIGN?=ECC256
|
SIGN?=ECC256
|
||||||
HASH?=SHA256
|
HASH?=SHA256
|
||||||
DEBUG?=1
|
|
||||||
VTOR?=1
|
VTOR?=1
|
||||||
CORTEX_M0?=0
|
|
||||||
NO_ASM?=0
|
|
||||||
EXT_FLASH?=0
|
|
||||||
SPI_FLASH?=0
|
|
||||||
ALLOW_DOWNGRADE?=0
|
|
||||||
NVM_FLASH_WRITEONCE?=0
|
|
||||||
WOLFBOOT_VERSION?=0
|
|
||||||
V?=0
|
|
||||||
SPMATH?=1
|
SPMATH?=1
|
||||||
RAM_CODE?=0
|
|
||||||
DUALBANK_SWAP?=0
|
|
||||||
IMAGE_HEADER_SIZE?=256
|
|
||||||
WOLFBOOT_PARTITION_SIZE?=0x20000
|
WOLFBOOT_PARTITION_SIZE?=0x20000
|
||||||
WOLFBOOT_SECTOR_SIZE?=0x20000
|
WOLFBOOT_SECTOR_SIZE?=0x20000
|
||||||
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
|
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08020000
|
||||||
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x40000
|
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08040000
|
||||||
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000
|
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x08060000
|
||||||
WOLFTPM?=1
|
WOLFTPM?=1
|
||||||
MEASURED_BOOT?=1
|
MEASURED_BOOT?=1
|
||||||
MEASURED_PCR_A?=16
|
MEASURED_PCR_A?=16
|
||||||
|
DEBUG?=1
|
||||||
|
|
2
wolfBoot
2
wolfBoot
|
@ -1 +1 @@
|
||||||
Subproject commit 75a7e57279b1c70ca741111705e98aff6307c333
|
Subproject commit 44f987ccce2feb6860fbf38189d104d909b01d98
|
Loading…
Reference in New Issue