Fixed stm32l5 artifacts

pull/50/head
Daniele Lacamera 2020-05-26 14:39:44 +02:00 committed by David Garske
parent 81acc3fc6d
commit 61890b0bdb
2 changed files with 7 additions and 4 deletions

View File

@ -217,7 +217,7 @@ MAIN_TARGET=factory.bin
ifeq ($(TARGET),stm32l5)
# Don't build a contiguous image
MAIN_TARGET:=wolfboot.bin
MAIN_TARGET:=wolfboot.bin test-app/image_v1_signed.bin
endif
@ -245,7 +245,7 @@ wolfboot-align.bin: .bootloader-partition-size wolfboot.bin
$(Q)$(SIZE) wolfboot.elf
@echo
test-app/image.bin: wolfboot-align.bin
test-app/image.bin: wolfboot.bin
$(Q)make -C test-app WOLFBOOT_ROOT=$(WOLFBOOT_ROOT)
$(Q)rm -f src/*.o hal/*.o
$(Q)$(SIZE) test-app/image.elf
@ -274,9 +274,11 @@ rsa4096.der:
keytools:
@make -C tools/keytools
factory.bin: $(BOOT_IMG) wolfboot-align.bin $(PRIVATE_KEY)
test-app/image_v1_signed.bin: test-app/image.bin
@echo "\t[SIGN] $(BOOT_IMG)"
$(Q)$(SIGN_TOOL) $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1
factory.bin: $(BOOT_IMG) wolfboot-align.bin $(PRIVATE_KEY) test-app/image_v1_signed.bin
@echo "\t[MERGE] $@"
$(Q)cat wolfboot-align.bin test-app/image_v1_signed.bin > $@

View File

@ -33,6 +33,7 @@ ifeq ($(ARCH),)
PKA?=1
PSOC6_CRYPTO?=1
WOLFTPM?=0
TZEN?=1
WOLFBOOT_PARTITION_SIZE?=0x20000
WOLFBOOT_SECTOR_SIZE?=0x20000
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
@ -49,7 +50,7 @@ CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO_DRIVERS
MCUXPRESSO_CMSIS FREEDOM_E_SDK STM32CUBE CYPRESS_PDL CYPRESS_CORE_LIB CYPRESS_TARGET_LIB DEBUG VTOR \
CORTEX_M0 CORTEX_M33 NO_ASM EXT_FLASH SPI_FLASH NO_XIP UART_FLASH ALLOW_DOWNGRADE NVM_FLASH_WRITEONCE \
WOLFBOOT_VERSION V NO_MPU \
SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA PSOC6_CRYPTO WOLFTPM \
SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA TZEN PSOC6_CRYPTO WOLFTPM \
WOLFBOOT_PARTITION_SIZE WOLFBOOT_SECTOR_SIZE \
WOLFBOOT_PARTITION_BOOT_ADDRESS WOLFBOOT_PARTITION_UPDATE_ADDRESS \
WOLFBOOT_PARTITION_SWAP_ADDRESS WOLFBOOT_LOAD_ADDRESS \