@@ -52,10 +52,10 @@ test-update: test-app/image.bin FORCE
5252 (make test-reset && sleep 1 && st-flash --reset write test-update.bin 0x08040000)
5353
5454test-self-update : wolfboot.bin test-app/image.bin FORCE
55- mv $(PRIVATE_KEY ) private_key.old
55+ @ mv $(PRIVATE_KEY ) private_key.old
5656 @make clean
5757 @rm src/* _pub_key.c
58- @make factory.bin RAM_CODE=1 WOLFBOOT_VERSION=$(WOLFBOOT_VERSION )
58+ @make factory.bin RAM_CODE=1 WOLFBOOT_VERSION=$(WOLFBOOT_VERSION ) SIGN= $( SIGN )
5959 @$(SIGN_TOOL ) test-app/image.bin $(PRIVATE_KEY ) $(TEST_UPDATE_VERSION )
6060 @st-flash --reset write test-app/image_v2_signed.bin 0x08020000 || \
6161 (make test-reset && sleep 1 && st-flash --reset write test-app/image_v2_signed.bin 0x08020000) || \
@@ -218,18 +218,25 @@ test-23-rollback-SPI: $(EXPVER) FORCE
218218 @echo TEST PASSED
219219
220220test-34-forward-self-update : $(EXPVER ) FORCE
221- @make test-erase-ext
222221 @echo Creating and uploading factory image...
223- @make test-factory RAM_CODE=1
222+ @make clean
223+ @make distclean
224+ @make test-factory RAM_CODE=1 SIGN=$(SIGN )
224225 @echo Expecting version ' 1'
225226 @$$(test `$(EXPVER ) ` -eq 1 )
226227 @echo
227228 @echo Updating keys, firmware, bootloader
228- @make test-self-update WOLFBOOT_VERSION=4 RAM_CODE=1
229+ @make test-self-update WOLFBOOT_VERSION=4 RAM_CODE=1 SIGN= $( SIGN )
229230 @sleep 2
230231 @$$(test `$(EXPVER ) ` -eq 2 )
231232 @make clean
232233 @echo TEST PASSED
233234
235+ test-44-forward-self-update-ECC : $(EXPVER ) FORCE
236+ @make test-34-forward-self-update SIGN=ECC256
237+
234238
235- test-all : clean test-01-forward-update-no-downgrade test-02-forward-update-allow-downgrade test-03-rollback test-11-forward-update-no-downgrade-ECC test-13-rollback-ECC test-21-forward-update-no-downgrade-SPI test-23-rollback-SPI test-34-forward-self-update
239+ test-all : clean test-01-forward-update-no-downgrade test-02-forward-update-allow-downgrade test-03-rollback \
240+ test-11-forward-update-no-downgrade-ECC test-13-rollback-ECC test-21-forward-update-no-downgrade-SPI test-23-rollback-SPI \
241+ test-34-forward-self-update \
242+ test-44-forward-self-update-ECC
0 commit comments