From 97fb3b68af47f0a42116b5a8100e7c98a04b155b Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Tue, 26 Nov 2024 11:17:35 +0100 Subject: [PATCH] Test: add IMAGE_HEADER_SIZE to sign command --- tools/test.mk | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/tools/test.mk b/tools/test.mk index 7ff4b3e9..8e88c93c 100644 --- a/tools/test.mk +++ b/tools/test.mk @@ -9,24 +9,16 @@ SIGN_ARGS= SIGN_ENC_ARGS= DELTA_DATA_SIZE?=2000 -# python version only supported using -# KEYGEN_TOOL="python3 $(WOLFBOOT_ROOT)/tools/keytools/keygen.py" -ifeq ("$(KEYGEN_TOOL)","") - ifneq ("$(wildcard $(WOLFBOOT_ROOT)/tools/keytools/keygen.exe)","") - KEYGEN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/keygen.exe - else - KEYGEN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/keygen - endif +ifneq ("$(wildcard $(WOLFBOOT_ROOT)/tools/keytools/keygen.exe)","") + KEYGEN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/keygen.exe +else + KEYGEN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/keygen endif -# python version only supported using -# SIGN_TOOL="python3 $(WOLFBOOT_ROOT)/tools/keytools/sign.py" -ifeq ("$(SIGN_TOOL)","") - ifneq ("$(wildcard $(WOLFBOOT_ROOT)/tools/keytools/sign.exe)","") - SIGN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/sign.exe - else - SIGN_TOOL=$(WOLFBOOT_ROOT)/tools/keytools/sign - endif +ifneq ("$(wildcard $(WOLFBOOT_ROOT)/tools/keytools/sign.exe)","") + SIGN_TOOL=IMAGE_HEADER_SIZE=$(IMAGE_HEADER_SIZE) $(WOLFBOOT_ROOT)/tools/keytools/sign.exe +else + SIGN_TOOL=IMAGE_HEADER_SIZE=$(IMAGE_HEADER_SIZE) $(WOLFBOOT_ROOT)/tools/keytools/sign endif # Make sign algorithm argument