Merge changes from topic "add-qcbor-dependency" into integration

* changes:
  chore(tc): increase stack size with 0x100 bytes
  chore(tc): link QCBOR library to the platform test
This commit is contained in:
Manish V Badarkhe 2024-10-14 15:05:53 +02:00 committed by TrustedFirmware Code Review
commit 742d0e6ef3
2 changed files with 6 additions and 3 deletions

View file

@ -187,7 +187,7 @@
# if SPM_MM
# define PLATFORM_STACK_SIZE 0x500
# else
# define PLATFORM_STACK_SIZE 0xa00
# define PLATFORM_STACK_SIZE 0xb00
# endif
#elif defined(IMAGE_BL32)
# define PLATFORM_STACK_SIZE 0x440

View file

@ -33,6 +33,7 @@ else ifeq (${PLATFORM_TEST},rse-rotpk)
$(eval $(call add_define,PLATFORM_TEST_ROTPK))
else ifeq (${PLATFORM_TEST},tfm-testsuite)
include drivers/arm/rse/rse_comms.mk
include drivers/measured_boot/rse/qcbor.mk
# The variables need to be set to compile the platform test:
ifeq (${TF_M_TESTS_PATH},)
@ -80,7 +81,8 @@ else ifeq (${PLATFORM_TEST},tfm-testsuite)
$(DELEGATED_ATTEST_TESTS_PATH)/delegated_attest_test.c \
drivers/auth/mbedtls/mbedtls_common.c \
lib/psa/measured_boot.c \
lib/psa/delegated_attestation.c
lib/psa/delegated_attestation.c \
${QCBOR_SOURCES}
PLAT_INCLUDES += -I$(TF_M_EXTRAS_PATH)/partitions/measured_boot/interface/include \
-I$(TF_M_EXTRAS_PATH)/partitions/delegated_attestation/interface/include \
@ -93,7 +95,8 @@ else ifeq (${PLATFORM_TEST},tfm-testsuite)
-Iplat/arm/board/tc \
-Iinclude/drivers/auth/mbedtls \
-Iinclude/drivers/arm \
-Iinclude/lib/psa
-Iinclude/lib/psa \
-I${QCBOR_INCLUDES}
# Some of the PSA functions are declared in multiple header files, that
# triggers this warning.