Remove duplicated object, move up WOLFBOOT_DEFS_PUBLIC

Author: mattia-moffa

CMakeLists.txt

@@ -1369,6 +1369,9 @@ if(TARGET ${WOLFSSL_TGT})
     )
 endif() # TARGET ${WOLFSSL_TGT}
 
+set(WOLFBOOT_DEFS_PUBLIC ${WOLFBOOT_DEFS})
+list(REMOVE_ITEM WOLFBOOT_DEFS_PUBLIC __WOLFBOOT)
+
 if(BUILD_TEST_APPS OR BUILD_IMAGE)
     message(STATUS "Building wolfBoot image")
     add_subdirectory(test-app)
@@ -1420,9 +1423,6 @@ set(WOLFBOOT_VERSION
     ${WOLFBOOT_VERSION}
     CACHE INTERNAL "")
 
-set(WOLFBOOT_DEFS_PUBLIC ${WOLFBOOT_DEFS})
-list(REMOVE_ITEM WOLFBOOT_DEFS_PUBLIC __WOLFBOOT)
-
 # generate target.h
 configure_file(include/target.h.in ${CMAKE_CURRENT_BINARY_DIR}/target.h @ONLY)
 

test-app/CMakeLists.txt

@@ -124,12 +124,9 @@ if(BUILD_TEST_APPS)
 
     # stm32h5-specific sources
     if("${WOLFBOOT_TARGET}" STREQUAL "stm32h5")
-        set_source_files_properties(${CMAKE_BINARY_DIR}/keystore.c PROPERTIES GENERATED TRUE)
         target_sources(image PRIVATE
             ../hal/uart/uart_drv_stm32h5.c
-            ${CMAKE_BINARY_DIR}/keystore.c
         )
-        add_dependencies(image keystore)
         target_compile_definitions(image PRIVATE
             APP_HAS_SYSTICK
             RAMFUNCTION=__attribute__\(\(used,section\(".ramcode"\),long_call\)\)
@@ -177,6 +174,11 @@ if(BUILD_TEST_APPS)
     # For TrustZone builds, avoid linking the bootloader lib (it defines NSC stubs).
     if(TZEN AND WOLFCRYPT_TZ)
         target_sources(image PRIVATE ../src/libwolfboot.c)
+        if(NOT SIGN STREQUAL "NONE")
+            set_source_files_properties(${CMAKE_BINARY_DIR}/keystore.c PROPERTIES GENERATED TRUE)
+            target_sources(image PRIVATE ${CMAKE_BINARY_DIR}/keystore.c)
+            add_dependencies(image keystore)
+        endif()
         target_link_libraries(image PRIVATE wolfboothal target)
     else()
         target_link_libraries(image PRIVATE wolfboot wolfboothal public_key target)